diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index 492f97975eda31f98957426c5b2497abb7a7394d..0fc8a1c44f7358a962276ebcf38a165d2db986cd 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -104,6 +104,6 @@ spec:
target:
type: Utilization
averageUtilization: 80
- #behavior:
- # scaleDown:
- # stabilizationWindowSeconds: 30
+ #behavior:
+ # scaleDown:
+ # stabilizationWindowSeconds: 30
diff --git a/manifests/e2e_orchestratorservice.yaml b/manifests/e2e_orchestratorservice.yaml
index 62a7559949a5119ab3ba33abd6b4403d7c698fc8..5f70fdfdac08112650afc7bc50f02a7eedd5a30a 100644
--- a/manifests/e2e_orchestratorservice.yaml
+++ b/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:
diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml
index 7d5586ebe4f68fe6b9f837eefde3ed0158117124..1f54c569ce861a9ac957a2e276eb0e5f227d514a 100644
--- a/manifests/pathcompservice.yaml
+++ b/manifests/pathcompservice.yaml
@@ -119,6 +119,6 @@ spec:
target:
type: Utilization
averageUtilization: 80
- #behavior:
- # scaleDown:
- # stabilizationWindowSeconds: 30
+ #behavior:
+ # scaleDown:
+ # stabilizationWindowSeconds: 30
diff --git a/manifests/serviceservice.yaml b/manifests/serviceservice.yaml
index 5bdc2223fabbcd4fbc8a2b41d59b0f48cca10d96..1dd383d615bb167ae6de15ae03c404a50bdee942 100644
--- a/manifests/serviceservice.yaml
+++ b/manifests/serviceservice.yaml
@@ -89,6 +89,6 @@ spec:
target:
type: Utilization
averageUtilization: 80
- #behavior:
- # scaleDown:
- # stabilizationWindowSeconds: 30
+ #behavior:
+ # scaleDown:
+ # stabilizationWindowSeconds: 30
diff --git a/manifests/sliceservice.yaml b/manifests/sliceservice.yaml
index d890444e0156e4a4bda9cc9840c8b0ab130813e4..96a324fdffc3c1aa249d5ec592b08fe90b710313 100644
--- a/manifests/sliceservice.yaml
+++ b/manifests/sliceservice.yaml
@@ -94,6 +94,6 @@ spec:
target:
type: Utilization
averageUtilization: 80
- #behavior:
- # scaleDown:
- # stabilizationWindowSeconds: 30
+ #behavior:
+ # scaleDown:
+ # stabilizationWindowSeconds: 30
diff --git a/manifests/ztpservice.yaml b/manifests/ztpservice.yaml
index 99b4f17088fe5c6bcace371081d34e87353f178e..98a31c86b63aba6fabafaebf0831469505a3ba6b 100644
--- a/manifests/ztpservice.yaml
+++ b/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
diff --git a/my_deploy.sh b/my_deploy.sh
index 636440e4e2cd4a27455af0c634961393a0b8f61e..8d2e733d462ae743c7187eb9b6a58d7da14033a7 100755
--- a/my_deploy.sh
+++ b/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"
diff --git a/proto/e2eorchestrator.proto b/proto/e2eorchestrator.proto
index 29a2b7736aa8067b6745c9685fe62164f9d2eb8b..731016934300a45e6664b90e73ba458cb03ecfb7 100644
--- a/proto/e2eorchestrator.proto
+++ b/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 {
diff --git a/src/tests/.gitlab-ci.yml b/src/tests/.gitlab-ci.yml
index 09f5ba12e8dd0f0adec04c769b634d7dd12d61ca..e7d96f298323f4698f5cf9ce89789788677d39f6 100644
--- a/src/tests/.gitlab-ci.yml
+++ b/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'
diff --git a/src/tests/ecoc24/deploy.sh b/src/tests/ecoc24/deploy.sh
index 06c54455d4ec5185c6d52c4d648f9c09fd273c8e..601bf463acf0809ce1d02351a53d0cbd54578b07 100755
--- a/src/tests/ecoc24/deploy.sh
+++ b/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
-
diff --git a/src/tests/ecoc24/subscription_ws_e2e.sh b/src/tests/ecoc24/subscription_ws_e2e.sh
index 6088871d19481c42ca16889b914e6ccacf2a284d..52a687f6f162f8d3bcce1f7d92ebfc53f3d41951 100755
--- a/src/tests/ecoc24/subscription_ws_e2e.sh
+++ b/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
-
-
-
diff --git a/src/tests/ecoc24/subscription_ws_ip.sh b/src/tests/ecoc24/subscription_ws_ip.sh
index f5e775d457e6e31429a41e1e1c44c47c36a9c8ce..69239b2576f14ebea418e8d6834ad0946b0bc0cf 100755
--- a/src/tests/ecoc24/subscription_ws_ip.sh
+++ b/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
-
-
-
diff --git a/src/tests/ecoc24/tfs-ingress-ip.yaml b/src/tests/ecoc24/tfs-ingress-ip.yaml
index d6aa56e93a3febf6a3956854c661a121d806eb88..f4e796349dce88749d8acc4bbd297d5494dc5642 100644
--- a/src/tests/ecoc24/tfs-ingress-ip.yaml
+++ b/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
diff --git a/src/tests/ecoc24/tfs-ingress-opt.yaml b/src/tests/ecoc24/tfs-ingress-opt.yaml
index 39969500b8d54af254645c48fac049a42cdf5a80..e0dc3b1ad8a58d83f09972d716c5b35439d46f27 100644
--- a/src/tests/ecoc24/tfs-ingress-opt.yaml
+++ b/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