pre-merge cleanup

deploy/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
-
-
-

deploy/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
-
-
-

manifests/contextservice.yaml

@@ -60,7 +60,7 @@ spec:
               command: ["/bin/grpc_health_probe", "-addr=:1010"]
           resources:
             requests:
-              cpu: 200m
+              cpu: 250m
               memory: 128Mi
             limits:
               cpu: 1000m
@@ -85,25 +85,25 @@ spec:
       protocol: TCP
       port: 9192
       targetPort: 9192
-#---
-#apiVersion: autoscaling/v2
-#kind: HorizontalPodAutoscaler
-#metadata:
-#  name: contextservice-hpa
-#spec:
-#  scaleTargetRef:
-#    apiVersion: apps/v1
-#    kind: Deployment
-#    name: contextservice
-#  minReplicas: 1
-#  maxReplicas: 20
-#  metrics:
-#    - type: Resource
-#      resource:
-#        name: cpu
-#        target:
-#          type: Utilization
-#          averageUtilization: 80
-#  #behavior:
-#  #  scaleDown:
-#  #    stabilizationWindowSeconds: 30
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+ name: contextservice-hpa
+spec:
+ scaleTargetRef:
+   apiVersion: apps/v1
+   kind: Deployment
+   name: contextservice
+ minReplicas: 1
+ maxReplicas: 20
+ metrics:
+   - type: Resource
+     resource:
+       name: cpu
+       target:
+         type: Utilization
+         averageUtilization: 80
+ #behavior:
+ #  scaleDown:
+ #    stabilizationWindowSeconds: 30

manifests/deviceservice.yaml

@@ -53,7 +53,7 @@ spec:
               command: ["/bin/grpc_health_probe", "-addr=:2020"]
           resources:
             requests:
-              cpu: 200m
+              cpu: 250m
               memory: 128Mi
             limits:
               cpu: 1000m

manifests/e2e_orchestratorservice.yaml

@@ -59,7 +59,7 @@ spec:
               command: ["/bin/grpc_health_probe", "-addr=:10050"]
           resources:
             requests:
-              cpu: 200m
+              cpu: 250m
               memory: 128Mi
             limits:
               cpu: 1000m

manifests/pathcompservice.yaml

@@ -47,7 +47,7 @@ spec:
               command: ["/bin/grpc_health_probe", "-addr=:10020"]
           resources:
             requests:
-              cpu: 200m
+              cpu: 250m
               memory: 128Mi
             limits:
               cpu: 1000m
@@ -100,25 +100,25 @@ spec:
       protocol: TCP
       port: 9192
       targetPort: 9192
-#---
-#apiVersion: autoscaling/v2
-#kind: HorizontalPodAutoscaler
-#metadata:
-#  name: pathcompservice-hpa
-#spec:
-#  scaleTargetRef:
-#    apiVersion: apps/v1
-#    kind: Deployment
-#    name: pathcompservice
-#  minReplicas: 1
-#  maxReplicas: 20
-#  metrics:
-#    - type: Resource
-#      resource:
-#        name: cpu
-#        target:
-#          type: Utilization
-#          averageUtilization: 80
-#  #behavior:
-#  #  scaleDown:
-#  #    stabilizationWindowSeconds: 30
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+ name: pathcompservice-hpa
+spec:
+ scaleTargetRef:
+   apiVersion: apps/v1
+   kind: Deployment
+   name: pathcompservice
+ minReplicas: 1
+ maxReplicas: 20
+ metrics:
+   - type: Resource
+     resource:
+       name: cpu
+       target:
+         type: Utilization
+         averageUtilization: 80
+ #behavior:
+ #  scaleDown:
+ #    stabilizationWindowSeconds: 30

manifests/policyservice.yaml

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

manifests/serviceservice.yaml

@@ -45,7 +45,7 @@ spec:
               command: ["/bin/grpc_health_probe", "-addr=:3030"]
           resources:
             requests:
-              cpu: 200m
+              cpu: 250m
               memory: 128Mi
             limits:
               cpu: 1000m
@@ -70,25 +70,25 @@ spec:
       protocol: TCP
       port: 9192
       targetPort: 9192
-#---
-#apiVersion: autoscaling/v2
-#kind: HorizontalPodAutoscaler
-#metadata:
-#  name: serviceservice-hpa
-#spec:
-#  scaleTargetRef:
-#    apiVersion: apps/v1
-#    kind: Deployment
-#    name: serviceservice
-#  minReplicas: 1
-#  maxReplicas: 20
-#  metrics:
-#    - type: Resource
-#      resource:
-#        name: cpu
-#        target:
-#          type: Utilization
-#          averageUtilization: 80
-#  #behavior:
-#  #  scaleDown:
-#  #    stabilizationWindowSeconds: 30
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+ name: serviceservice-hpa
+spec:
+ scaleTargetRef:
+   apiVersion: apps/v1
+   kind: Deployment
+   name: serviceservice
+ minReplicas: 1
+ maxReplicas: 20
+ metrics:
+   - type: Resource
+     resource:
+       name: cpu
+       target:
+         type: Utilization
+         averageUtilization: 80
+ #behavior:
+ #  scaleDown:
+ #    stabilizationWindowSeconds: 30

manifests/sliceservice.yaml

@@ -50,7 +50,7 @@ spec:
               command: ["/bin/grpc_health_probe", "-addr=:4040"]
           resources:
             requests:
-              cpu: 200m
+              cpu: 250m
               memory: 128Mi
             limits:
               cpu: 1000m
@@ -75,25 +75,25 @@ spec:
       protocol: TCP
       port: 9192
       targetPort: 9192
-#---
-#apiVersion: autoscaling/v2
-#kind: HorizontalPodAutoscaler
-#metadata:
-#  name: sliceservice-hpa
-#spec:
-#  scaleTargetRef:
-#    apiVersion: apps/v1
-#    kind: Deployment
-#    name: sliceservice
-#  minReplicas: 1
-#  maxReplicas: 20
-#  metrics:
-#    - type: Resource
-#      resource:
-#        name: cpu
-#        target:
-#          type: Utilization
-#          averageUtilization: 80
-#  #behavior:
-#  #  scaleDown:
-#  #    stabilizationWindowSeconds: 30
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+ name: sliceservice-hpa
+spec:
+ scaleTargetRef:
+   apiVersion: apps/v1
+   kind: Deployment
+   name: sliceservice
+ minReplicas: 1
+ maxReplicas: 20
+ metrics:
+   - type: Resource
+     resource:
+       name: cpu
+       target:
+         type: Utilization
+         averageUtilization: 80
+ #behavior:
+ #  scaleDown:
+ #    stabilizationWindowSeconds: 30

manifests/vnt_managerservice.yaml

@@ -52,7 +52,7 @@ spec:
               command: ["/bin/grpc_health_probe", "-addr=:10080"]
           resources:
             requests:
-              cpu: 200m
+              cpu: 250m
               memory: 128Mi
             limits:
               cpu: 1000m

manifests/webuiservice.yaml

@@ -61,44 +61,44 @@ spec:
             limits:
               cpu: 1000m
               memory: 1024Mi
-#        - name: grafana
-#          image: grafana/grafana:8.5.22
-#          imagePullPolicy: IfNotPresent
-#          ports:
-#            - containerPort: 3000
-#              name: http-grafana
-#              protocol: TCP
-#          env:
-#            - name: GF_SERVER_ROOT_URL
-#              value: "http://0.0.0.0:3000/grafana/"
-#            - name: GF_SERVER_SERVE_FROM_SUB_PATH
-#              value: "true"
-#          readinessProbe:
-#            failureThreshold: 60
-#            httpGet:
-#              #path: /robots.txt
-#              path: /login
-#              port: 3000
-#              scheme: HTTP
-#            initialDelaySeconds: 1
-#            periodSeconds: 1
-#            successThreshold: 1
-#            timeoutSeconds: 2
-#          livenessProbe:
-#            failureThreshold: 60
-#            initialDelaySeconds: 1
-#            periodSeconds: 1
-#            successThreshold: 1
-#            tcpSocket:
-#              port: 3000
-#            timeoutSeconds: 1
-#          resources:
-#            requests:
-#              cpu: 250m
-#              memory: 512Mi
-#            limits:
-#              cpu: 500m
-#              memory: 1024Mi
+        - name: grafana
+          image: grafana/grafana:8.5.22
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 3000
+              name: http-grafana
+              protocol: TCP
+          env:
+            - name: GF_SERVER_ROOT_URL
+              value: "http://0.0.0.0:3000/grafana/"
+            - name: GF_SERVER_SERVE_FROM_SUB_PATH
+              value: "true"
+          readinessProbe:
+            failureThreshold: 60
+            httpGet:
+              #path: /robots.txt
+              path: /login
+              port: 3000
+              scheme: HTTP
+            initialDelaySeconds: 1
+            periodSeconds: 1
+            successThreshold: 1
+            timeoutSeconds: 2
+          livenessProbe:
+            failureThreshold: 60
+            initialDelaySeconds: 1
+            periodSeconds: 1
+            successThreshold: 1
+            tcpSocket:
+              port: 3000
+            timeoutSeconds: 1
+          resources:
+            requests:
+              cpu: 250m
+              memory: 512Mi
+            limits:
+              cpu: 500m
+              memory: 1024Mi
 ---
 apiVersion: v1
 kind: Service

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

src/tests/ecoc24/deploy_e2e.sh

@@ -28,6 +28,6 @@ source src/tests/ecoc24/deploy_specs_e2e.sh
 ./deploy/all.sh
 
 #Configure Subscription WS
-./deploy/subscription_ws_e2e.sh
+./src/tests/ecoc24/deploy/subscription_ws_e2e.sh
 
 mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh

src/tests/ecoc24/deploy_ip.sh

@@ -28,6 +28,6 @@ source src/tests/ecoc24/deploy_specs_ip.sh
 ./deploy/all.sh
 
 #Configure Subscription WS
-./deploy/subscription_ws_ip.sh
+./src/tests/ecoc24/subscription_ws_ip.sh
 
 mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh

src/tests/ecoc24/subscription_ws_e2e.sh

+#!/bin/bash
+# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+########################################################################################################################
+# Read deployment settings
+########################################################################################################################
+
+# If not already set, set the namespace where CockroackDB will be deployed.
+export SUBSCRIPTION_WS_NAMESPACE=${SUBSCRIPTION_WS_NAMESPACE:-"tfs-e2e"}
+
+# If not already set, set the external port interface will be exposed to.
+export SUBSCRIPTION_WS_EXT_PORT=${SUBSCRIPTION_WS_EXT_PORT:-"8761"}
+
+
+########################################################################################################################
+# Automated steps start here
+########################################################################################################################
+
+
+echo "Subscription WebSocket Port Mapping"
+echo ">>> ExposeSubscription WebSocket port (${SUBSCRIPTION_WS_EXT_PORT}->${SUBSCRIPTION_WS_EXT_PORT})"
+PATCH='{"data": {"'${SUBSCRIPTION_WS_EXT_PORT}'": "'${SUBSCRIPTION_WS_NAMESPACE}'/nbiservice:'${SUBSCRIPTION_WS_EXT_PORT}'"}}'
+kubectl patch configmap nginx-ingress-tcp-microk8s-conf-e2e --namespace ingress --patch "${PATCH}"
+
+PORT_MAP='{"containerPort": '${SUBSCRIPTION_WS_EXT_PORT}', "hostPort": '${SUBSCRIPTION_WS_EXT_PORT}'}'
+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

+#!/bin/bash
+# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+########################################################################################################################
+# Read deployment settings
+########################################################################################################################
+
+# If not already set, set the namespace where CockroackDB will be deployed.
+export SUBSCRIPTION_WS_NAMESPACE=${SUBSCRIPTION_WS_NAMESPACE:-"tfs-ip"}
+
+# If not already set, set the external port interface will be exposed to.
+export SUBSCRIPTION_WS_INT_PORT=${SUBSCRIPTION_WS_INT_PORT:-"8762"}
+########################################################################################################################
+# Automated steps start here
+########################################################################################################################
+
+
+
+
+echo "Subscription WebSocket Port Mapping"
+echo ">>> ExposeSubscription WebSocket port (${SUBSCRIPTION_WS_INT_PORT}->${SUBSCRIPTION_WS_INT_PORT})"
+PATCH='{"data": {"'${SUBSCRIPTION_WS_INT_PORT}'": "'${SUBSCRIPTION_WS_NAMESPACE}'/nbiservice:'${SUBSCRIPTION_WS_INT_PORT}'"}}'
+kubectl patch configmap nginx-ingress-tcp-microk8s-conf-ip --namespace ingress --patch "${PATCH}"
+
+PORT_MAP='{"containerPort": '${SUBSCRIPTION_WS_INT_PORT}', "hostPort": '${SUBSCRIPTION_WS_INT_PORT}'}'
+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
+
+
+