Commit 3b47e6ff authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent b359fe30

manifests/analyticsservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ spec: 
apiVersion: v1

kind: Service

metadata:

  name: analytics-frontendservice

  name: analyticsservice

  labels:

    app: analyticsservice

spec:

manifests/automationservice.yaml

+0 −5
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ spec: 
          env:

            - name: LOG_LEVEL

              value: "INFO"

          envFrom:

#            - secretRef:

#                name: crdb-analytics

            - secretRef:

                name: kfk-kpi-data

          startupProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:30200"]

manifests/telemetryservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ spec: 
apiVersion: v1

kind: Service

metadata:

  name: telemetry-frontendservice

  name: telemetryservice

  labels:

    app: telemetryservice

spec:

my_deploy.sh

+5 −5
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 
export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"



# Set the list of components, separated by spaces, you want to build images for, and deploy.

export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator automation"

export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"



# Uncomment to activate Monitoring (old)

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"



# Uncomment to activate Monitoring Framework (new)

export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api telemetry analytics"

#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api telemetry analytics automation"



# Uncomment to activate BGP-LS Speaker

#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"
@@ -42,10 +42,10 @@ export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_ 
#fi



# Uncomment to activate ZTP

export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"

#export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"



# Uncomment to activate Policy Manager

export TFS_COMPONENTS="${TFS_COMPONENTS} policy"

#export TFS_COMPONENTS="${TFS_COMPONENTS} policy"



# Uncomment to activate Optical CyberSecurity

#export TFS_COMPONENTS="${TFS_COMPONENTS} dbscanserving opticalattackmitigator opticalattackdetector opticalattackmanager"
@@ -86,7 +86,7 @@ export TFS_IMAGE_TAG="dev" 


# Set the name of the Kubernetes namespace to deploy TFS to.

export TFS_K8S_NAMESPACE="tfs"

:



# Set additional manifest files to be applied after the deployment

export TFS_EXTRA_MANIFESTS="manifests/nginx_ingress_http.yaml"

scripts/run_tests_locally-analytics-DB.sh

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ PROJECTDIR=`pwd` 
cd $PROJECTDIR/src

RCFILE=$PROJECTDIR/coverage/.coveragerc

CRDB_SQL_ADDRESS=$(kubectl get service cockroachdb-public --namespace crdb -o jsonpath='{.spec.clusterIP}')

export CRDB_URI="cockroachdb://tfs:tfs123@${CRDB_SQL_ADDRESS}:26257/tfs-analyzer?sslmode=require"

export CRDB_URI="cockroachdb://tfs:tfs123@${CRDB_SQL_ADDRESS}:26257/tfs_analytics?sslmode=require"

python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \

    analytics/tests/test_analytics_db.py