From 56a3ce406c20b96fe3dbe208ad19356cfc912fb4 Mon Sep 17 00:00:00 2001 From: rebiffe Date: Fri, 10 Feb 2023 14:04:15 +0000 Subject: [PATCH 1/2] Update scripts/service_provisioning/PROV_SC_02/README.md, scripts/service_provisioning/PROV_SC_02/svlan_registration_creation.xml.pyformat, scripts/service_provisioning/PROV_SC_02/svlan_creation.xml.pyformat, scripts/service_provisioning/PROV_SC_02/PROV_SC_02_script.txt, xml-examples/service_provisioning/3_provider_edge_bridge/6_cvlan_registration_creation_request.xml, scripts/service_provisioning/PROV_SC_02/svlan_creation_untagged_pvid.xml.pyformat, scripts/service_provisioning/PROV_SC_02/PROV_SC_02_deletion_script.txt, scripts/service_provisioning/PROV_SC_02/svlan_deletion.xml.pyformat --- .../PROV_SC_02/PROV_SC_02_deletion_script.txt | 12 ++++++ .../PROV_SC_02/PROV_SC_02_script.txt | 14 +++++++ .../service_provisioning/PROV_SC_02/README.md | 29 ++++++++++++++ .../PROV_SC_02/svlan_creation.xml.pyformat | 38 +++++++++++++++++++ .../svlan_creation_untagged_pvid.xml.pyformat | 11 ++++++ .../PROV_SC_02/svlan_deletion.xml.pyformat | 22 +++++++++++ .../svlan_registration_creation.xml.pyformat | 22 +++++++++++ .../6_cvlan_registration_creation_request.xml | 2 +- 8 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 scripts/service_provisioning/PROV_SC_02/PROV_SC_02_deletion_script.txt create mode 100644 scripts/service_provisioning/PROV_SC_02/PROV_SC_02_script.txt create mode 100644 scripts/service_provisioning/PROV_SC_02/README.md create mode 100644 scripts/service_provisioning/PROV_SC_02/svlan_creation.xml.pyformat create mode 100644 scripts/service_provisioning/PROV_SC_02/svlan_creation_untagged_pvid.xml.pyformat create mode 100644 scripts/service_provisioning/PROV_SC_02/svlan_deletion.xml.pyformat create mode 100644 scripts/service_provisioning/PROV_SC_02/svlan_registration_creation.xml.pyformat diff --git a/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_deletion_script.txt b/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_deletion_script.txt new file mode 100644 index 0000000..4b5f7cb --- /dev/null +++ b/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_deletion_script.txt @@ -0,0 +1,12 @@ +# PROV_C_01_deletion_script.txt for Lightweight NETCONF controlleur lncc.py + +set feedback_to_output true +ne load ne.yaml +mapping add COMMON '{svid: 201, svlan_name: VLAN-201, cvid1: 101, cvlan1_name: VLAN-101, cvid2: 102, cvlan2_name: VLAN-102}` + +mapping add NE_SPECIFIC --ne my_ne1 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 1, port2_portref: 3, port1_name: eth0}' +mapping add NE_SPECIFIC --ne my_ne2 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 1, port2_portref: 3, port1_name: eth0}' + +connect +netconf edit-config --target running --config-template svlan_deletion.xml.pyformat --mappings bridge +netconf close-session diff --git a/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_script.txt b/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_script.txt new file mode 100644 index 0000000..70f0715 --- /dev/null +++ b/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_script.txt @@ -0,0 +1,14 @@ +# PROV_C_02_script.txt for Lightweight NETCONF controlleur lncc.py + +set feedback_to_output true +ne load ne.yaml +mapping add COMMON '{svid: 201, svlan_name: VLAN-201, cvid1: 101, cvlan1_name: VLAN-101, cvid2: 102, cvlan2_name: VLAN-102}` + +mapping add NE_SPECIFIC --ne my_ne1 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 1, port2_portref: 3, port1_name: eth0}' +mapping add NE_SPECIFIC --ne my_ne2 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 1, port2_portref: 3, port1_name: eth0}' + +connect +netconf edit-config --target running --config-template svlan_creation.xml.pyformat --mappings COMMON NE_SPECIFIC +netconf edit-config --target running --config-template svlan_registration_creation.xml.pyformat --mappings COMMON NE_SPECIFIC +# For untagged: cvlan_creation_untagged_pvid.xml.pyformat +netconf close-session diff --git a/scripts/service_provisioning/PROV_SC_02/README.md b/scripts/service_provisioning/PROV_SC_02/README.md new file mode 100644 index 0000000..920841d --- /dev/null +++ b/scripts/service_provisioning/PROV_SC_02/README.md @@ -0,0 +1,29 @@ +# PROV_SC_02 service-provisioning test + +The _PROV_SC_02_script.txt_ script should provision S-VLAN service, based on "Provider Edge Bridge". + +As per agreements during call, this test is **Optional**: Only vendors which want to participates. + + +```console +$ python3 lncc.py "run_script PROV_SC_02_script.txt" +``` + +Edit the mappings for each NE: +| Parameter | Example value | +|----------------|---------------| +| bridge_name | Bridge-1 | +| component_name | Component-1 | +| svid | 201 | +| svlan_name | VLAN-201 | +| port1_portref | 1 | +| port2_portref | 3 | +| port1_name | eth0 | +| cvid1 | 101 | +| cvlan1_name | VLAN-102 | +| cvid2 | 102 | +| cvlan2_name | VLAN-102 | + +Example: `{bridge_name: Bridge-1, component_name: Component-1, svid: 201, svlan_name: VLAN-201, port1_portref: 1, port2_portref: 3, cvid1: 101, cvlan1_name: VLAN-101, cvid2: 102, cvlan2_name: VLAN-102}` + +## Deletion diff --git a/scripts/service_provisioning/PROV_SC_02/svlan_creation.xml.pyformat b/scripts/service_provisioning/PROV_SC_02/svlan_creation.xml.pyformat new file mode 100644 index 0000000..fdb9467 --- /dev/null +++ b/scripts/service_provisioning/PROV_SC_02/svlan_creation.xml.pyformat @@ -0,0 +1,38 @@ + + + + + {bridge_name} + + {component_name} + + + {svid} + {svlan_name} + + + + + 1 + {svid} + static + + {port1_portref} + + fixed-new-ignored + untagged + + + + {port2_portref} + + fixed-new-ignored + tagged + + + + + + + + diff --git a/scripts/service_provisioning/PROV_SC_02/svlan_creation_untagged_pvid.xml.pyformat b/scripts/service_provisioning/PROV_SC_02/svlan_creation_untagged_pvid.xml.pyformat new file mode 100644 index 0000000..5f7f845 --- /dev/null +++ b/scripts/service_provisioning/PROV_SC_02/svlan_creation_untagged_pvid.xml.pyformat @@ -0,0 +1,11 @@ + + + + + {port1_name} + + {vid} + + + + diff --git a/scripts/service_provisioning/PROV_SC_02/svlan_deletion.xml.pyformat b/scripts/service_provisioning/PROV_SC_02/svlan_deletion.xml.pyformat new file mode 100644 index 0000000..a88cfae --- /dev/null +++ b/scripts/service_provisioning/PROV_SC_02/svlan_deletion.xml.pyformat @@ -0,0 +1,22 @@ + + + + + {bridge_name} + + {component_name} + + + 1 + {svid} + + + + + {svid} + + + + + + diff --git a/scripts/service_provisioning/PROV_SC_02/svlan_registration_creation.xml.pyformat b/scripts/service_provisioning/PROV_SC_02/svlan_registration_creation.xml.pyformat new file mode 100644 index 0000000..b7b636d --- /dev/null +++ b/scripts/service_provisioning/PROV_SC_02/svlan_registration_creation.xml.pyformat @@ -0,0 +1,22 @@ + + + + + {port1_portref} + + + {cvid1} + {svid} + false + false + + + {cvid2} + {svid} + false + false + + + + + diff --git a/xml-examples/service_provisioning/3_provider_edge_bridge/6_cvlan_registration_creation_request.xml b/xml-examples/service_provisioning/3_provider_edge_bridge/6_cvlan_registration_creation_request.xml index d8da283..522e03a 100644 --- a/xml-examples/service_provisioning/3_provider_edge_bridge/6_cvlan_registration_creation_request.xml +++ b/xml-examples/service_provisioning/3_provider_edge_bridge/6_cvlan_registration_creation_request.xml @@ -20,4 +20,4 @@ - \ No newline at end of file + -- GitLab From aa19f5bfbb06c2d56fa7791767ee07d2ea76f480 Mon Sep 17 00:00:00 2001 From: niloda Date: Wed, 15 Feb 2023 15:14:13 +0100 Subject: [PATCH 2/2] Update PROV_SC_02_deletion_script.txt, PROV_SC_02_script.txt and svlan_registration_creation.xml.pyformat and added svlan_registration_deletion.xml.pyformat --- .../PROV_SC_02/PROV_SC_02_deletion_script.txt | 5 +++-- .../PROV_SC_02/PROV_SC_02_script.txt | 2 +- .../svlan_registration_creation.xml.pyformat | 4 ++-- .../svlan_registration_deletion.xml.pyformat | 16 ++++++++++++++++ 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 scripts/service_provisioning/PROV_SC_02/svlan_registration_deletion.xml.pyformat diff --git a/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_deletion_script.txt b/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_deletion_script.txt index 4b5f7cb..eaa3c10 100644 --- a/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_deletion_script.txt +++ b/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_deletion_script.txt @@ -2,11 +2,12 @@ set feedback_to_output true ne load ne.yaml -mapping add COMMON '{svid: 201, svlan_name: VLAN-201, cvid1: 101, cvlan1_name: VLAN-101, cvid2: 102, cvlan2_name: VLAN-102}` +mapping add COMMON '{svid: 201, svlan_name: VLAN-201, cvid1: 101, cvlan1_name: VLAN-101, cvid2: 102, cvlan2_name: VLAN-102}' mapping add NE_SPECIFIC --ne my_ne1 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 1, port2_portref: 3, port1_name: eth0}' mapping add NE_SPECIFIC --ne my_ne2 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 1, port2_portref: 3, port1_name: eth0}' connect -netconf edit-config --target running --config-template svlan_deletion.xml.pyformat --mappings bridge +netconf edit-config --target running --config-template svlan_deletion.xml.pyformat --mappings COMMON NE_SPECIFIC +netconf edit-config --target running --config-template svlan_registration_deletion.xml.pyformat --mappings COMMON NE_SPECIFIC netconf close-session diff --git a/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_script.txt b/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_script.txt index 70f0715..6232418 100644 --- a/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_script.txt +++ b/scripts/service_provisioning/PROV_SC_02/PROV_SC_02_script.txt @@ -2,7 +2,7 @@ set feedback_to_output true ne load ne.yaml -mapping add COMMON '{svid: 201, svlan_name: VLAN-201, cvid1: 101, cvlan1_name: VLAN-101, cvid2: 102, cvlan2_name: VLAN-102}` +mapping add COMMON '{svid: 201, svlan_name: VLAN-201, cvid1: 101, cvlan1_name: VLAN-101, cvid2: 102, cvlan2_name: VLAN-102}' mapping add NE_SPECIFIC --ne my_ne1 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 1, port2_portref: 3, port1_name: eth0}' mapping add NE_SPECIFIC --ne my_ne2 '{bridge_name: Bridge-1, component_name: Component-1, port1_portref: 1, port2_portref: 3, port1_name: eth0}' diff --git a/scripts/service_provisioning/PROV_SC_02/svlan_registration_creation.xml.pyformat b/scripts/service_provisioning/PROV_SC_02/svlan_registration_creation.xml.pyformat index b7b636d..49c86ce 100644 --- a/scripts/service_provisioning/PROV_SC_02/svlan_registration_creation.xml.pyformat +++ b/scripts/service_provisioning/PROV_SC_02/svlan_registration_creation.xml.pyformat @@ -2,7 +2,7 @@ - {port1_portref} + {port1_name} {cvid1} @@ -10,7 +10,7 @@ false false - + {cvid2} {svid} false diff --git a/scripts/service_provisioning/PROV_SC_02/svlan_registration_deletion.xml.pyformat b/scripts/service_provisioning/PROV_SC_02/svlan_registration_deletion.xml.pyformat new file mode 100644 index 0000000..22d88d0 --- /dev/null +++ b/scripts/service_provisioning/PROV_SC_02/svlan_registration_deletion.xml.pyformat @@ -0,0 +1,16 @@ + + + + + {port1_name} + + + {cvid1} + + + {cvid2} + + + + + -- GitLab