Commit ad1a0593 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 69dbd40a

manifests/webuiservice.yaml

+45 −45
Original line number Diff line number Diff line
@@ -72,51 +72,51 @@ 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

        #  volumeMounts:

        #    - mountPath: /var/lib/grafana

        #      name: grafana-pv

      #volumes:

      #  - name: grafana-pv

      #    persistentVolumeClaim:

      #      claimName: grafana-pvc

        - 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

          volumeMounts:

            - mountPath: /var/lib/grafana

              name: grafana-pv

      volumes:

        - name: grafana-pv

          persistentVolumeClaim:

            claimName: grafana-pvc

---

apiVersion: v1

kind: Service

src/tests/ofc24/deploy-node-agents.sh

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ docker network rm na-br 
echo

echo "Pull Docker images:"

echo "-------------------"

#docker pull asgamb1/oc23bgp.img:latest

#docker pull asgamb1/flexscale-node.img:latest

docker pull asgamb1/oc23bgp.img:latest

docker pull asgamb1/flexscale-node.img:latest





echo

src/tests/ofc24/descriptors/topology.json

+13 −13
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
            "device_id": {"device_uuid": {"uuid": "T1.1"}}, "device_type": "optical-transponder", "device_drivers": [11],

            "device_operational_status": 1,

            "device_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.254.253.101"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {

                    "username": "admin", "password": "admin", "force_running": false, "hostkey_verify": false,
@@ -23,7 +23,7 @@ 
            "device_id": {"device_uuid": {"uuid": "T1.2"}}, "device_type": "optical-transponder", "device_drivers": [11],

            "device_operational_status": 1,

            "device_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.254.253.101"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {

                    "username": "admin", "password": "admin", "force_running": false, "hostkey_verify": false,
@@ -36,7 +36,7 @@ 
            "device_id": {"device_uuid": {"uuid": "T1.3"}}, "device_type": "optical-transponder", "device_drivers": [11],

            "device_operational_status": 1,

            "device_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.254.253.101"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {

                    "username": "admin", "password": "admin", "force_running": false, "hostkey_verify": false,
@@ -49,8 +49,8 @@ 
            "device_id": {"device_uuid": {"uuid": "T2.1"}}, "device_type": "optical-transponder", "device_drivers": [11],

            "device_operational_status": 1,

            "device_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2023"}},

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.254.253.102"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {

                    "username": "admin", "password": "admin", "force_running": false, "hostkey_verify": false,

                    "look_for_keys": false, "allow_agent": false, "commit_per_rule": false,
@@ -62,8 +62,8 @@ 
            "device_id": {"device_uuid": {"uuid": "T2.2"}}, "device_type": "optical-transponder", "device_drivers": [11],

            "device_operational_status": 1,

            "device_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2023"}},

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.254.253.102"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {

                    "username": "admin", "password": "admin", "force_running": false, "hostkey_verify": false,

                    "look_for_keys": false, "allow_agent": false, "commit_per_rule": false,
@@ -75,8 +75,8 @@ 
            "device_id": {"device_uuid": {"uuid": "T2.3"}}, "device_type": "optical-transponder", "device_drivers": [11],

            "device_operational_status": 1,

            "device_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2023"}},

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.254.253.102"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {

                    "username": "admin", "password": "admin", "force_running": false, "hostkey_verify": false,

                    "look_for_keys": false, "allow_agent": false, "commit_per_rule": false,
@@ -88,8 +88,8 @@ 
            "device_id": {"device_uuid": {"uuid": "R1"}}, "device_type": "optical-roadm", "device_drivers": [11],

            "device_operational_status": 1,

            "device_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2024"}},

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.254.253.201"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {

                    "username": "admin", "password": "admin", "force_running": false, "hostkey_verify": false,

                    "look_for_keys": false, "allow_agent": false, "commit_per_rule": false, "type": "optical-roadm",
@@ -101,8 +101,8 @@ 
            "device_id": {"device_uuid": {"uuid": "R2"}}, "device_type": "optical-roadm", "device_drivers": [11],

            "device_operational_status": 1,

            "device_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2025"}},

                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.254.253.202"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {

                    "username": "admin", "password": "admin", "force_running": false, "hostkey_verify": false,

                    "look_for_keys": false, "allow_agent": false, "commit_per_rule": false, "type": "optical-roadm",