Merge branch...

Merge branch 'feat/147-integrate-support-for-ip-e2e-optical-sdn-controllers-to-manage-hierarchical-virtual' of https://labs.etsi.org/rep/tfs/controller into feat/147-integrate-support-for-ip-e2e-optical-sdn-controllers-to-manage-hierarchical-virtual

manifests/contextservice.yaml

@@ -104,6 +104,6 @@ spec:
         target:
           type: Utilization
           averageUtilization: 80
- #behavior:
- #  scaleDown:
- #    stabilizationWindowSeconds: 30
+  #behavior:
+  #  scaleDown:
+  #    stabilizationWindowSeconds: 30

manifests/e2e_orchestratorservice.yaml

@@ -26,8 +26,6 @@ spec:
       annotations:
         config.linkerd.io/skip-outbound-ports: "8761"
         config.linkerd.io/skip-inbound-ports: "8761"
-
-
       labels:
         app: e2e-orchestratorservice
     spec:

manifests/pathcompservice.yaml

@@ -119,6 +119,6 @@ spec:
         target:
           type: Utilization
           averageUtilization: 80
- #behavior:
- #  scaleDown:
- #    stabilizationWindowSeconds: 30
+  #behavior:
+  #  scaleDown:
+  #    stabilizationWindowSeconds: 30

manifests/serviceservice.yaml

@@ -89,6 +89,6 @@ spec:
         target:
           type: Utilization
           averageUtilization: 80
- #behavior:
- #  scaleDown:
- #    stabilizationWindowSeconds: 30
+  #behavior:
+  #  scaleDown:
+  #    stabilizationWindowSeconds: 30

manifests/sliceservice.yaml

@@ -94,6 +94,6 @@ spec:
         target:
           type: Utilization
           averageUtilization: 80
- #behavior:
- #  scaleDown:
- #    stabilizationWindowSeconds: 30
+  #behavior:
+  #  scaleDown:
+  #    stabilizationWindowSeconds: 30

manifests/ztpservice.yaml

@@ -104,22 +104,22 @@ spec:
             limits:
               cpu: 2000m
               memory: 2048Mi
----
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: ztpservice-hpa
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: ztpservice
-  minReplicas: 1
-  maxReplicas: 10
-  metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: 80
+# ---
+# apiVersion: autoscaling/v2
+# kind: HorizontalPodAutoscaler
+# metadata:
+#  name: ztpservice-hpa
+# spec:
+#  scaleTargetRef:
+#    apiVersion: apps/v1
+#    kind: Deployment
+#    name: ztpservice
+#  minReplicas: 1
+#  maxReplicas: 10
+#  metrics:
+#    - type: Resource
+#      resource:
+#        name: cpu
+#        target:
+#          type: Utilization
+#          averageUtilization: 80

my_deploy.sh

@@ -63,10 +63,10 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui"
 #export TFS_COMPONENTS="${TFS_COMPONENTS} forecaster"
 
 # Uncomment to activate E2E Orchestrator
-# export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"
+#export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"
 
 # Uncomment to activate VNT Manager
-# export TFS_COMPONENTS="${TFS_COMPONENTS} vnt_manager"
+#export TFS_COMPONENTS="${TFS_COMPONENTS} vnt_manager"
 
 # Uncomment to activate DLT and Interdomain
 #export TFS_COMPONENTS="${TFS_COMPONENTS} interdomain dlt"

proto/e2eorchestrator.proto

@@ -22,7 +22,6 @@ import "context.proto";
 service E2EOrchestratorService {
   rpc Compute(E2EOrchestratorRequest) returns (E2EOrchestratorReply)  {}
   rpc PushTopology(context.Topology)  returns (context.Empty)         {}
-
 }
 
 message E2EOrchestratorRequest {

src/tests/.gitlab-ci.yml

@@ -20,5 +20,4 @@ include:
   #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'
   #- local: '/src/tests/ofc23/.gitlab-ci.yml'
   - local: '/src/tests/ofc24/.gitlab-ci.yml'
-  - local: '/src/tests/ofc24/.gitlab-ci.yml'
- 
\ No newline at end of file
+  - local: '/src/tests/ecoc24/.gitlab-ci.yml'

src/tests/ecoc24/deploy.sh

@@ -36,4 +36,3 @@ mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh
 source ./src/tests/ecoc24/deploy_specs_e2e.sh
 ./deploy/all.sh
 mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh
-

src/tests/ecoc24/subscription_ws_e2e.sh

@@ -40,6 +40,3 @@ CONTAINER='{"name": "nginx-ingress-microk8s", "ports": ['${PORT_MAP}']}'
 PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'
 kubectl patch daemonset nginx-ingress-microk8s-controller-e2e --namespace ingress --patch "${PATCH}"
 echo
-
-
-

src/tests/ecoc24/subscription_ws_ip.sh

@@ -40,6 +40,3 @@ CONTAINER='{"name": "nginx-ingress-microk8s", "ports": ['${PORT_MAP}']}'
 PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'
 kubectl patch daemonset nginx-ingress-microk8s-controller-ip --namespace ingress --patch "${PATCH}"
 echo
-
-
-

src/tests/ecoc24/tfs-ingress-ip.yaml

@@ -57,4 +57,4 @@ spec:
             service:
               name: nbiservice
               port:
-                number: 8080
\ No newline at end of file
+                number: 8080

src/tests/ecoc24/tfs-ingress-opt.yaml

@@ -57,4 +57,4 @@ spec:
             service:
               name: nbiservice
               port:
-                number: 8080
\ No newline at end of file
+                number: 8080