Pre-merge code fixes and cleanup

.gitlab-ci.yml

@@ -22,38 +22,38 @@ stages:
 # include the individual .gitlab-ci.yml of each micro-service and tests
 include:
   #- local: '/manifests/.gitlab-ci.yml'
-  #- local: '/src/monitoring/.gitlab-ci.yml'
-  #- local: '/src/nbi/.gitlab-ci.yml'
-  #- local: '/src/context/.gitlab-ci.yml'
-  #- local: '/src/device/.gitlab-ci.yml'
-  #- local: '/src/service/.gitlab-ci.yml'
-  #- local: '/src/dbscanserving/.gitlab-ci.yml'
-  #- local: '/src/opticalattackmitigator/.gitlab-ci.yml'
-  #- local: '/src/opticalattackdetector/.gitlab-ci.yml'
-  #- local: '/src/opticalattackmanager/.gitlab-ci.yml'
-  #- local: '/src/opticalcontroller/.gitlab-ci.yml'
-  #- local: '/src/ztp/.gitlab-ci.yml'
-  #- local: '/src/policy/.gitlab-ci.yml'
-  #- local: '/src/automation/.gitlab-ci.yml'
-  #- local: '/src/forecaster/.gitlab-ci.yml'
+  - local: '/src/monitoring/.gitlab-ci.yml'
+  - local: '/src/nbi/.gitlab-ci.yml'
+  - local: '/src/context/.gitlab-ci.yml'
+  - local: '/src/device/.gitlab-ci.yml'
+  - local: '/src/service/.gitlab-ci.yml'
+  - local: '/src/dbscanserving/.gitlab-ci.yml'
+  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'
+  - local: '/src/opticalattackdetector/.gitlab-ci.yml'
+  - local: '/src/opticalattackmanager/.gitlab-ci.yml'
+  - local: '/src/opticalcontroller/.gitlab-ci.yml'
+  - local: '/src/ztp/.gitlab-ci.yml'
+  - local: '/src/policy/.gitlab-ci.yml'
+  - local: '/src/automation/.gitlab-ci.yml'
+  - local: '/src/forecaster/.gitlab-ci.yml'
   #- local: '/src/webui/.gitlab-ci.yml'
   #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
   #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
   #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
-  #- local: '/src/slice/.gitlab-ci.yml'
+  - local: '/src/slice/.gitlab-ci.yml'
   #- local: '/src/interdomain/.gitlab-ci.yml'
-  #- local: '/src/pathcomp/.gitlab-ci.yml'
+  - local: '/src/pathcomp/.gitlab-ci.yml'
   #- local: '/src/dlt/.gitlab-ci.yml'
-  #- local: '/src/load_generator/.gitlab-ci.yml'
-  #- local: '/src/bgpls_speaker/.gitlab-ci.yml'
-  #- local: '/src/kpi_manager/.gitlab-ci.yml'
-  #- local: '/src/kpi_value_api/.gitlab-ci.yml'
-  #- local: '/src/kpi_value_writer/.gitlab-ci.yml'
-  #- local: '/src/telemetry/.gitlab-ci.yml'
-  #- local: '/src/analytics/.gitlab-ci.yml'
-  #- local: '/src/qos_profile/.gitlab-ci.yml'
-  #- local: '/src/vnt_manager/.gitlab-ci.yml'
-  #- local: '/src/e2e_orchestrator/.gitlab-ci.yml'
+  - local: '/src/load_generator/.gitlab-ci.yml'
+  - local: '/src/bgpls_speaker/.gitlab-ci.yml'
+  - local: '/src/kpi_manager/.gitlab-ci.yml'
+  - local: '/src/kpi_value_api/.gitlab-ci.yml'
+  - local: '/src/kpi_value_writer/.gitlab-ci.yml'
+  - local: '/src/telemetry/.gitlab-ci.yml'
+  - local: '/src/analytics/.gitlab-ci.yml'
+  - local: '/src/qos_profile/.gitlab-ci.yml'
+  - local: '/src/vnt_manager/.gitlab-ci.yml'
+  - local: '/src/e2e_orchestrator/.gitlab-ci.yml'
 
   # This should be last one: end-to-end integration tests
   - local: '/src/tests/.gitlab-ci.yml'

deploy/crdb.sh

@@ -156,18 +156,16 @@ function crdb_undeploy_single() {
 
 function crdb_drop_databases_single() {
     echo "Drop TFS databases, if exist"
-    echo "CRDB_NAMESPACE=${CRDB_NAMESPACE}"
-
-    kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o yaml
-
-    #if [[ -z "${GITLAB_CI}" ]]; then
-    CRDB_HOST="cockroachdb-0"
-    #CRDB_HOST=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}')
-    CRDB_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
-    #else
-    #    CRDB_HOST="127.0.0.1"
-    #    CRDB_PORT=${CRDB_EXT_PORT_SQL}
-    #fi
+
+    if [[ -z "${GITLAB_CI}" ]]; then
+        kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o yaml
+        CRDB_HOST="cockroachdb-0"
+        #CRDB_HOST=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}')
+        CRDB_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
+    else
+        CRDB_HOST="127.0.0.1"
+        CRDB_PORT=${CRDB_EXT_PORT_SQL}
+    fi
 
     CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@${CRDB_HOST}:${CRDB_PORT}/defaultdb?sslmode=require"
     echo "CRDB_CLIENT_URL=${CRDB_CLIENT_URL}"

src/tests/.gitlab-ci.yml

@@ -14,11 +14,11 @@
 
 # include the individual .gitlab-ci.yml of each end-to-end integration test
 include:
-  #- local: '/src/tests/ofc22/.gitlab-ci.yml'
+  - local: '/src/tests/ofc22/.gitlab-ci.yml'
   #- local: '/src/tests/oeccpsc22/.gitlab-ci.yml'
-  #- local: '/src/tests/ecoc22/.gitlab-ci.yml'
+  - local: '/src/tests/ecoc22/.gitlab-ci.yml'
   #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'
   #- local: '/src/tests/ofc23/.gitlab-ci.yml'
   - local: '/src/tests/ofc24/.gitlab-ci.yml'
-  #- local: '/src/tests/eucnc24/.gitlab-ci.yml'
+  - local: '/src/tests/eucnc24/.gitlab-ci.yml'
   #- local: '/src/tests/ecoc24/.gitlab-ci.yml'

src/tests/ofc24/.gitlab-ci.yml

@@ -134,20 +134,18 @@ end2end_test ofc24:
     - source src/tests/${TEST_NAME}/deploy_specs.sh
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server
-    #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend
+    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server
-    #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/sliceservice -c server
-    #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
-    #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/webuiservice -c server
+    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/opticalcontrollerservice -c server
     - if docker ps -a | grep ${TEST_NAME}; then docker rm -f ${TEST_NAME}; fi
 
     # Dump Optical Device Node Agents container status and logs
     - docker ps -a
-    #- docker logs na-t1
-    #- docker logs na-t2
-    #- docker logs na-r1
-    #- docker logs na-r2
+    - docker logs na-t1
+    - docker logs na-t2
+    - docker logs na-r1
+    - docker logs na-r2
 
     # Destroy Optical Device Node Agents
     - docker rm -f na-t1 na-t2 na-r1 na-r2

src/tests/ofc24/deploy_specs.sh

@@ -21,7 +21,7 @@ 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"
-export TFS_COMPONENTS="context device pathcomp service slice nbi webui"
+export TFS_COMPONENTS="context device pathcomp service nbi"
 
 # Uncomment to activate Monitoring
 #export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"