Commit 1cca5064 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Test - OFC 24:

- Correct deploy specs
- Correct deploy node agents
- Correct topology descriptor
parent 3b52148c
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -26,27 +26,27 @@ 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
echo "Create Management Network and Node Agents:"
echo "------------------------------------------"
docker network create -d bridge --subnet=172.254.253.0/24 --gateway=172.254.253.254 --ip-range=172.254.253.0/24 na-br
docker run -dit --init --name na-t1 --network=na-br --ip 172.254.253.101 \
docker run -dit --init --name na-t1 --network=na-br --ip 172.254.253.101 --publish 2022:2022 \
    --volume "$PWD/src/tests/${TEST_NAME}/node-agents-config/startNetconfAgent-tp.sh:/confd/examples.confd/OC23/startNetconfAgent.sh" \
    --volume "$PWD/src/tests/${TEST_NAME}/node-agents-config/platform_t1.xml:/confd/examples.confd/OC23/platform.xml" \
    asgamb1/oc23bgp.img:latest /confd/examples.confd/OC23/startNetconfAgent.sh
docker run -dit --init --name na-t2 --network=na-br --ip 172.254.253.102 \
docker run -dit --init --name na-t2 --network=na-br --ip 172.254.253.102 --publish 2023:2022 \
    --volume "$PWD/src/tests/${TEST_NAME}/node-agents-config/startNetconfAgent-tp.sh:/confd/examples.confd/OC23/startNetconfAgent.sh" \
    --volume "$PWD/src/tests/${TEST_NAME}/node-agents-config/platform_t2.xml:/confd/examples.confd/OC23/platform.xml" \
    asgamb1/oc23bgp.img:latest /confd/examples.confd/OC23/startNetconfAgent.sh
docker run -dit --init --name na-r1 --network=na-br --ip 172.254.253.201 \
docker run -dit --init --name na-r1 --network=na-br --ip 172.254.253.201 --publish 2024:2022 \
    --volume "$PWD/src/tests/${TEST_NAME}/node-agents-config/startNetconfAgent-mg-on.sh:/confd/examples.confd/OC23/startNetconfAgent.sh" \
    --volume "$PWD/src/tests/${TEST_NAME}/node-agents-config/platform_r1.xml:/confd/examples.confd/OC23/platform.xml" \
    asgamb1/flexscale-node.img:latest /confd/examples.confd/OC23/startNetconfAgent.sh
docker run -dit --init --name na-r2 --network=na-br --ip 172.254.253.202 \
docker run -dit --init --name na-r2 --network=na-br --ip 172.254.253.202 --publish 2025:2022 \
    --volume "$PWD/src/tests/${TEST_NAME}/node-agents-config/startNetconfAgent-mg-on.sh:/confd/examples.confd/OC23/startNetconfAgent.sh" \
    --volume "$PWD/src/tests/${TEST_NAME}/node-agents-config/platform_r2.xml:/confd/examples.confd/OC23/platform.xml" \
    asgamb1/flexscale-node.img:latest /confd/examples.confd/OC23/startNetconfAgent.sh
+2 −2
Original line number Diff line number Diff line
@@ -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 nbi"
export TFS_COMPONENTS="context device pathcomp service nbi webui"

# Uncomment to activate Monitoring
#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -107,7 +107,7 @@ export CRDB_DEPLOY_MODE="single"
export CRDB_DROP_DATABASE_IF_EXISTS="YES"

# Disable flag for re-deploying CockroachDB from scratch.
export CRDB_REDEPLOY="YES"
export CRDB_REDEPLOY=""


# ----- NATS -------------------------------------------------------------------
+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": "172.254.253.101"}},
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
                {"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": "172.254.253.101"}},
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
                {"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": "172.254.253.101"}},
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
                {"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": "172.254.253.102"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},
                {"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/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": "172.254.253.102"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},
                {"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/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": "172.254.253.102"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},
                {"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/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": "172.254.253.201"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},
                {"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/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": "172.254.253.202"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2022"}},
                {"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/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",