From 07919450b5e74752cc68bfa5391325eee9a22ca3 Mon Sep 17 00:00:00 2001 From: rebiffe Date: Wed, 8 Feb 2023 12:32:02 +0000 Subject: [PATCH 1/2] Update scripts/service_provisioning/PROV_C_01/cvlan_creation_untagged_interfacepvid.xml.pyformat, scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt, scripts/service_provisioning/PROV_C_01/README.md --- .../PROV_C_01/PROV_C_01_untagged_script.txt | 5 +++-- scripts/service_provisioning/PROV_C_01/README.md | 4 ++++ ...cvlan_creation_untagged_interfacepvid.xml.pyformat | 11 +++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 scripts/service_provisioning/PROV_C_01/cvlan_creation_untagged_interfacepvid.xml.pyformat diff --git a/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt b/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt index 3bd4be1..27a8fcc 100644 --- a/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt +++ b/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt @@ -4,10 +4,11 @@ set feedback_to_output true ne load ne.yaml mapping add COMMON '{vid: 102, vlan_name: VLAN-102}' -mapping add NE_SPECIFIC --ne my_ne1 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 2, port2_portref: 3}' -mapping add NE_SPECIFIC --ne my_ne2 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 2, port2_portref: 3}' +mapping add NE_SPECIFIC --ne my_ne1 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 2, port1_name: 2, port2_portref: 3}' +mapping add NE_SPECIFIC --ne my_ne2 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 2, port1_name: 2, port2_portref: 3}' connect netconf edit-config --target running --config-template cvlan_creation_untagged.xml.pyformat --mappings COMMON NE_SPECIFIC +netconf edit-config --target running --config-template cvlan_creation_untagged_interfacepvid.xml.pyformat --mappings COMMON NE_SPECIFIC netconf close-session diff --git a/scripts/service_provisioning/PROV_C_01/README.md b/scripts/service_provisioning/PROV_C_01/README.md index 2dfbc23..e32ab83 100644 --- a/scripts/service_provisioning/PROV_C_01/README.md +++ b/scripts/service_provisioning/PROV_C_01/README.md @@ -25,6 +25,10 @@ The same apply for _PROV_C_01_untagged_script.txt_ ```console $ python3 lncc.py "run_script PROV_C_01_untagged_script.txt" ``` +Provisioing of unttaged require one more paramater: +| Parameter | Example value | +|----------------|---------------| +| port1_portref | port1_name | ## Deletion diff --git a/scripts/service_provisioning/PROV_C_01/cvlan_creation_untagged_interfacepvid.xml.pyformat b/scripts/service_provisioning/PROV_C_01/cvlan_creation_untagged_interfacepvid.xml.pyformat new file mode 100644 index 0000000..5f7f845 --- /dev/null +++ b/scripts/service_provisioning/PROV_C_01/cvlan_creation_untagged_interfacepvid.xml.pyformat @@ -0,0 +1,11 @@ + + + + + {port1_name} + + {vid} + + + + -- GitLab From 4b0c0b65955862f5962aca76a79c2188243e7bf1 Mon Sep 17 00:00:00 2001 From: rebiffe Date: Wed, 8 Feb 2023 13:31:37 +0000 Subject: [PATCH 2/2] Update scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_plus_pvid_script.txt, scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt --- .../PROV_C_01_untagged_plus_pvid_script.txt | 17 +++++++++++++++++ .../PROV_C_01/PROV_C_01_untagged_script.txt | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_plus_pvid_script.txt diff --git a/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_plus_pvid_script.txt b/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_plus_pvid_script.txt new file mode 100644 index 0000000..d35e239 --- /dev/null +++ b/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_plus_pvid_script.txt @@ -0,0 +1,17 @@ +# PROV_C_01_script.txt for Lightweight NETCONF controlleur lncc.py + +# For vendors which does requires PVID (cvlan_creation_untagged_interfacepvid.xml.pyformat) + +set feedback_to_output true +ne load ne.yaml +mapping add COMMON '{vid: 102, vlan_name: VLAN-102}' + +mapping add NE_SPECIFIC --ne my_ne1 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 2, port1_name: 2, port2_portref: 3}' +mapping add NE_SPECIFIC --ne my_ne2 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 2, port1_name: 2, port2_portref: 3}' + +connect +netconf edit-config --target running --config-template cvlan_creation_untagged.xml.pyformat --mappings COMMON NE_SPECIFIC +netconf edit-config --target running --config-template cvlan_creation_untagged_interfacepvid.xml.pyformat --mappings COMMON NE_SPECIFIC +netconf close-session + + diff --git a/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt b/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt index 27a8fcc..4bb7799 100644 --- a/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt +++ b/scripts/service_provisioning/PROV_C_01/PROV_C_01_untagged_script.txt @@ -1,5 +1,7 @@ # PROV_C_01_script.txt for Lightweight NETCONF controlleur lncc.py +# For vendors which doesnt requires PVID (cvlan_creation_untagged_interfacepvid.xml.pyformat) + set feedback_to_output true ne load ne.yaml mapping add COMMON '{vid: 102, vlan_name: VLAN-102}' @@ -9,6 +11,5 @@ mapping add NE_SPECIFIC --ne my_ne2 '{bridge_name: Bridge-1, component_name: Com connect netconf edit-config --target running --config-template cvlan_creation_untagged.xml.pyformat --mappings COMMON NE_SPECIFIC -netconf edit-config --target running --config-template cvlan_creation_untagged_interfacepvid.xml.pyformat --mappings COMMON NE_SPECIFIC netconf close-session -- GitLab