Commit b335489f authored by Andrea Sgambelluri's avatar Andrea Sgambelluri
Browse files

PMPv1: align the bench descriptors and scripts with the running simulators

Working-tree changes that predate the OFC26 work, collected here so they
are not lost and stay separable from it.

- leaf_hub.json: drop the two r*_optical packet-routers, and point the
  devices at the ports the simulators actually listen on (T1.x 2023,
  T2.1 2024, R1 2025, R2 2026) instead of 830/2027/2028.
- remote-topo.json: shift the two ROADMs down to 2024 and 2025 to match.
- simple pmp/simple_pmp_bidir.json: three sources rather than four, each
  on its line port 4, with an explicit oc_type=pmp constraint and the
  subcarrier list cut to 3,4,5.
- remove_tree.sh: the containers are named t1..t3 and r1..r4, not
  nat*/nar*, so the teardown was removing nothing.
- r_t.sh: make it executable.
- show_logs_service.sh: follow the log instead of dumping and exiting.

Co-Authored-By: default avatarClaude Opus 5 <noreply@anthropic.com>
parent 9e82a62e
Loading
Loading
Loading
Loading
+1 −1
Changes for scripts/show_logs_service.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}
# Automated steps start here
########################################################################################################################

kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server
kubectl --namespace $TFS_K8S_NAMESPACE logs --follow  deployment/serviceservice -c server
+34 −62
Changes for src/tests/PMPv1/descriptors/leaf_hub.json: 34 added lines, 62 removed lines.
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@
            "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.30.7.8"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "830"}},
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.65"}},
                {"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,
@@ -17,8 +17,8 @@
            "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.30.7.8"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "830"}},
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.65"}},
                {"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,
@@ -30,8 +30,8 @@
            "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.30.7.8"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "830"}},
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.65"}},
                {"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,
@@ -43,8 +43,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.30.7.7"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "830"}},
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.65"}},
                {"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,
@@ -57,7 +57,7 @@
            "device_operational_status": 1,
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.65"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2027"}},
                {"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",
@@ -70,41 +70,13 @@
            "device_operational_status": 1,
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.65"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2028"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2026"}},
                {"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",
                    "device_params": {"name": "default"}, "manager_params": {"timeout": 120}
                }}}
            ]}
        },
        {
            "device_id": {"device_uuid": {"uuid": "r1_optical"}}, "device_type": "packet-router",
            "device_drivers": ["DEVICEDRIVER_OPENCONFIG"],
            "device_config": {"config_rules": [
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.8"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "830"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "username": "admin", "password": "admin", "use_tls": false,
                    "hostkey_verify": false, "look_for_keys": false, "allow_agent": false,
                    "force_running": true
                }}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/populate_resource_keys", "resource_value": "__inventory__, __interfaces__, __network_instances__,__endpoints__"}}
            ]}
        },
        {
            "device_id": {"device_uuid": {"uuid": "r2_optical"}}, "device_type": "packet-router",
            "device_drivers": ["DEVICEDRIVER_OPENCONFIG"],
            "device_config": {"config_rules": [
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.7"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "830"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "username": "admin", "password": "admin", "use_tls": false,
                    "hostkey_verify": false, "look_for_keys": false, "allow_agent": false,
                    "force_running": true
                }}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/populate_resource_keys", "resource_value": "__inventory__, __interfaces__, __network_instances__,__endpoints__"}}
            ]}
        }
    ],
    "optical_links": [
@@ -123,7 +95,7 @@
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "5"
                        "uuid": "4"
                    }
                },
                {
@@ -139,9 +111,9 @@
            ],
            "optical_details": {
                "length": 0,
                "src_port": "5",
                "src_port": "4",
                "dst_port": "port-1-in",
                "local_peer_port": "5",
                "local_peer_port": "4",
                "remote_peer_port": "port-1-out",
                "used": false,
                "c_slots": {
@@ -227,7 +199,7 @@
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "5"
                        "uuid": "4"
                    }
                },
                {
@@ -243,9 +215,9 @@
            ],
            "optical_details": {
                "length": 0,
                "src_port": "5",
                "src_port": "4",
                "dst_port": "port-2-in",
                "local_peer_port": "5",
                "local_peer_port": "4",
                "remote_peer_port": "port-2-out",
                "used": false,
                "c_slots": {
@@ -331,7 +303,7 @@
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "5"
                        "uuid": "4"
                    }
                },
                {
@@ -347,9 +319,9 @@
            ],
            "optical_details": {
                "length": 0,
                "src_port": "5",
                "src_port": "4",
                "dst_port": "port-3-in",
                "local_peer_port": "5",
                "local_peer_port": "4",
                "remote_peer_port": "port-3-out",
                "used": false,
                "c_slots": {
@@ -445,16 +417,16 @@
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "5"
                        "uuid": "4"
                    }
                }
            ],
            "optical_details": {
                "length": 0,
                "src_port": "port-1-out",
                "dst_port": "5",
                "dst_port": "4",
                "local_peer_port": "port-1-in",
                "remote_peer_port": "5",
                "remote_peer_port": "4",
                "used": false,
                "c_slots": {
                    "1": 1,
@@ -549,16 +521,16 @@
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "5"
                        "uuid": "4"
                    }
                }
            ],
            "optical_details": {
                "length": 0,
                "src_port": "port-2-out",
                "dst_port": "5",
                "dst_port": "4",
                "local_peer_port": "port-2-in",
                "remote_peer_port": "5",
                "remote_peer_port": "4",
                "used": false,
                "c_slots": {
                    "1": 1,
@@ -653,16 +625,16 @@
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "5"
                        "uuid": "4"
                    }
                }
            ],
            "optical_details": {
                "length": 0,
                "src_port": "port-3-out",
                "dst_port": "5",
                "dst_port": "4",
                "local_peer_port": "port-3-in",
                "remote_peer_port": "5",
                "remote_peer_port": "4",
                "used": false,
                "c_slots": {
                    "1": 1,
@@ -953,7 +925,7 @@
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "5"
                        "uuid": "4"
                    }
                },
                {
@@ -969,9 +941,9 @@
            ],
            "optical_details": {
                "length": 0,
                "src_port": "5",
                "src_port": "4",
                "dst_port": "port-11-in",
                "local_peer_port": "5",
                "local_peer_port": "4",
                "remote_peer_port": "port-11-out",
                "used": false,
                "c_slots": {
@@ -1067,16 +1039,16 @@
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "5"
                        "uuid": "4"
                    }
                }
            ],
            "optical_details": {
                "length": 0,
                "src_port": "port-11-out",
                "dst_port": "5",
                "dst_port": "4",
                "local_peer_port": "port-11-in",
                "remote_peer_port": "5",
                "remote_peer_port": "4",
                "used": false,
                "c_slots": {
                    "1": 1,
+2 −2
Changes for src/tests/PMPv1/descriptors/remote-topo.json: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
            "device_operational_status": 1,
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.65"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2025"}},
                {"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,
@@ -31,7 +31,7 @@
            "device_operational_status": 1,
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.30.7.65"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "2026"}},
                {"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,
+6 −6
Changes for src/tests/PMPv1/descriptors/simple pmp/simple_pmp_bidir.json: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -8,18 +8,18 @@
            "service_type": 6, 
            "service_status": {"service_status": 1}, 
            "service_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "T1.1"}}, "endpoint_uuid": {"uuid": "1"}},
                {"device_id": {"device_uuid": {"uuid": "T1.2"}}, "endpoint_uuid": {"uuid": "2"}},
                {"device_id": {"device_uuid": {"uuid": "T1.3"}}, "endpoint_uuid": {"uuid": "3"}},
                {"device_id": {"device_uuid": {"uuid": "T1.4"}}, "endpoint_uuid": {"uuid": "4"}},
                {"device_id": {"device_uuid": {"uuid": "T2.1"}}, "endpoint_uuid": {"uuid": "1"}}
                {"device_id": {"device_uuid": {"uuid": "T1.1"}}, "endpoint_uuid": {"uuid": "4"}},
                {"device_id": {"device_uuid": {"uuid": "T1.2"}}, "endpoint_uuid": {"uuid": "4"}},
                {"device_id": {"device_uuid": {"uuid": "T1.3"}}, "endpoint_uuid": {"uuid": "4"}},
                {"device_id": {"device_uuid": {"uuid": "T2.1"}}, "endpoint_uuid": {"uuid": "4"}}
            ],
            "service_constraints": [
                {"custom": {"constraint_type": "bandwidth[gbps]", "constraint_value": "100.0"}},
                {"custom": {"constraint_type": "bidirectionality", "constraint_value": "1"}},
                {"custom": {"constraint_type": "optical-band-width[GHz]", "constraint_value": "200"}},
                {"custom": {"constraint_type": "op_mode", "constraint_value": "1"}},
                {"custom": {"constraint_type": "subcarrier", "constraint_value": "3,4,5,2"}}
                {"custom": {"constraint_type": "oc_type", "constraint_value": "pmp"}},
                {"custom": {"constraint_type": "subcarrier", "constraint_value": "3,4,5"}}
            ],
            "service_config": {"config_rules": []}
        }

src/tests/PMPv1/r_t.sh

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

Loading