Remove variables for vpnservice 09/109609/16
authorOleksandr Zharov <oleksandr.zharov@pantheon.tech>
Wed, 3 Jan 2024 19:49:51 +0000 (20:49 +0100)
committerOleksandr Zharov <oleksandr.zharov@pantheon.tech>
Fri, 16 Feb 2024 15:44:45 +0000 (16:44 +0100)
Removed variables for vpnservice project.

JIRA: INTTEST-140
Change-Id: Ie8d980b51b916b6198af1c3cb2f9780c9dbca4fc
Signed-off-by: Oleksandr Zharov <oleksandr.zharov@pantheon.tech>
23 files changed:
csit/variables/vpnservice/Variables.py [deleted file]
csit/variables/vpnservice/assoc_l3vpn/location.uri [deleted file]
csit/variables/vpnservice/assoc_l3vpn/post_data.json [deleted file]
csit/variables/vpnservice/assoc_two_router_l3vpn/location.uri [deleted file]
csit/variables/vpnservice/assoc_two_router_l3vpn/post_data.json [deleted file]
csit/variables/vpnservice/bgp_neighbor.json [deleted file]
csit/variables/vpnservice/bgp_router.json [deleted file]
csit/variables/vpnservice/configureSwitches.py [deleted file]
csit/variables/vpnservice/dissoc_l3vpn/location.uri [deleted file]
csit/variables/vpnservice/dissoc_l3vpn/post_data.json [deleted file]
csit/variables/vpnservice/dissoc_two_router_l3vpn/location.uri [deleted file]
csit/variables/vpnservice/dissoc_two_router_l3vpn/post_data.json [deleted file]
csit/variables/vpnservice/get_l3vpn/location.uri [deleted file]
csit/variables/vpnservice/get_l3vpn/post_data.json [deleted file]
csit/variables/vpnservice/itm_create/location.uri [deleted file]
csit/variables/vpnservice/itm_create/post_data.json [deleted file]
csit/variables/vpnservice/l3vpn_create/location.uri [deleted file]
csit/variables/vpnservice/l3vpn_create/post_data.json [deleted file]
csit/variables/vpnservice/l3vpn_delete/location.uri [deleted file]
csit/variables/vpnservice/l3vpn_delete/post_data.json [deleted file]
csit/variables/vpnservice/vm_interface.json [deleted file]
csit/variables/vpnservice/vm_vpninterface.json [deleted file]
csit/variables/vpnservice/vpn_instance.json [deleted file]

diff --git a/csit/variables/vpnservice/Variables.py b/csit/variables/vpnservice/Variables.py
deleted file mode 100644 (file)
index 9b3a58f..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-def get_variables():
-    variables = {}
-    vpn_instance = {
-        "vpn-instance": [
-            {
-                "description": "Test VPN Instance 1",
-                "vpn-instance-name": "testVpn1",
-                "ipv4-family": {
-                    "route-distinguisher": "1000:1",
-                    "export-route-policy": "3000:1,4000:1",
-                    "import-route-policy": "1000:1,2000:1",
-                    "apply-label": {"apply-label-per-route": "true"},
-                },
-            }
-        ]
-    }
-    vm_interface = {
-        "interface": [
-            {
-                "name": "s1-eth1",
-                "type": "iana-if-type:l2vlan",
-                "odl-interface:of-port-id": "openflow:1:1",
-                "enabled": "true",
-            }
-        ]
-    }
-    vm_vpninterface = {
-        "vpn-interface": [
-            {
-                "odl-l3vpn:adjacency": [
-                    {
-                        "odl-l3vpn:ip_address": "10.0.0.1",
-                        "odl-l3vpn:mac_address": "12:f8:57:a8:b9:a1",
-                    }
-                ],
-                "vpn-instance-name": "testVpn1",
-                "name": "s1-eth1",
-            }
-        ]
-    }
-    bgp_router = {
-        "bgp-router": {"local-as-identifier": "10.10.10.10", "local-as-number": 108}
-    }
-    bgp_neighbor = {
-        "bgp-neighbor": [{"as-number": 105, "ip-address": "169.144.42.168"}]
-    }
-    variables = {
-        "vpn_instance": vpn_instance,
-        "vm_interface": vm_interface,
-        "vm_vpninterface": vm_vpninterface,
-        "bgp_router": bgp_router,
-        "bgp_neighbor": bgp_neighbor,
-    }
-    return variables
diff --git a/csit/variables/vpnservice/assoc_l3vpn/location.uri b/csit/variables/vpnservice/assoc_l3vpn/location.uri
deleted file mode 100644 (file)
index 5cb7a4a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/neutronvpn:associateNetworks
diff --git a/csit/variables/vpnservice/assoc_l3vpn/post_data.json b/csit/variables/vpnservice/assoc_l3vpn/post_data.json
deleted file mode 100644 (file)
index b5c6e66..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "input":{
-      "vpn-id":"$vpnid",
-      "network-id":[
-         "$networkid"
-      ]
-   }
-}
diff --git a/csit/variables/vpnservice/assoc_two_router_l3vpn/location.uri b/csit/variables/vpnservice/assoc_two_router_l3vpn/location.uri
deleted file mode 100644 (file)
index 8f5acac..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/neutronvpn:associateRouter
diff --git a/csit/variables/vpnservice/assoc_two_router_l3vpn/post_data.json b/csit/variables/vpnservice/assoc_two_router_l3vpn/post_data.json
deleted file mode 100644 (file)
index 24b57e9..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "input":{
-      "vpn-id":"$vpnid",
-      "router-ids":[
-              {
-               "router-id":"$routerid"
-              }
-       ]
-   }
-}
diff --git a/csit/variables/vpnservice/bgp_neighbor.json b/csit/variables/vpnservice/bgp_neighbor.json
deleted file mode 100644 (file)
index c36147e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "bgp-neighbor": [
-        {
-            "as-number": 105,
-            "ip-address": "169.144.42.168"
-        }
-    ]
-}
diff --git a/csit/variables/vpnservice/bgp_router.json b/csit/variables/vpnservice/bgp_router.json
deleted file mode 100644 (file)
index 6c10aee..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "bgp-router": {
-        "local-as-identifier": "10.10.10.10",
-        "local-as-number": 108
-    }
-}
diff --git a/csit/variables/vpnservice/configureSwitches.py b/csit/variables/vpnservice/configureSwitches.py
deleted file mode 100644 (file)
index f5d1f7b..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-import json
-
-
-def get_variables(mininet1_ip, mininet2_ip):
-    vpn_instances = {
-        "vpn-instance": [
-            {
-                "description": "Test VPN Instance 1",
-                "vpn-instance-name": "testVpn1",
-                "ipv4-family": {
-                    "route-distinguisher": "100:1",
-                    "export-route-policy": "300:1",
-                    "import-route-policy": "200:1",
-                    "apply-label": {"apply-label-per-route": "true"},
-                },
-            },
-            {
-                "description": "Test VPN Instance 2",
-                "vpn-instance-name": "testVpn2",
-                "ipv4-family": {
-                    "route-distinguisher": "400:1",
-                    "export-route-policy": "500:1",
-                    "import-route-policy": "600:1",
-                    "apply-label": {"apply-label-per-route": "true"},
-                },
-            },
-        ]
-    }
-    ietf_interfaces = {
-        "interface": [
-            {
-                "name": "s1-eth1",
-                "type": "iana-if-type:l2vlan",
-                "odl-interface:of-port-id": "openflow:1:1",
-                "enabled": "true",
-            },
-            {
-                "name": "s1-eth2",
-                "type": "iana-if-type:l2vlan",
-                "odl-interface:of-port-id": "openflow:1:2",
-                "enabled": "true",
-            },
-            {
-                "name": "s2-eth1",
-                "type": "iana-if-type:l2vlan",
-                "odl-interface:of-port-id": "openflow:2:1",
-                "enabled": "true",
-            },
-            {
-                "name": "s2-eth2",
-                "type": "iana-if-type:l2vlan",
-                "odl-interface:of-port-id": "openflow:2:2",
-                "enabled": "true",
-            },
-            {
-                "enabled": "true",
-                "odl-interface:of-port-id": "openflow:1:3",
-                "description": "VM Port mpls",
-                "name": "s1-gre1",
-                "type": "odl-interface:l3tunnel",
-                "odl-interface:tunnel-type": "odl-interface:tunnel-type-gre",
-                "odl-interface:local-ip": mininet1_ip,
-                "odl-interface:remote-ip": mininet2_ip,
-            },
-            {
-                "enabled": "true",
-                "odl-interface:of-port-id": "openflow:2:3",
-                "description": "VM Port mpls",
-                "name": "s2-gre1",
-                "type": "odl-interface:l3tunnel",
-                "odl-interface:tunnel-type": "odl-interface:tunnel-type-gre",
-                "odl-interface:local-ip": mininet2_ip,
-                "odl-interface:remote-ip": mininet1_ip,
-            },
-        ]
-    }
-    vpn_interfaces = {
-        "vpn-interface": [
-            {
-                "odl-l3vpn:adjacency": [
-                    {
-                        "odl-l3vpn:ip_address": "10.0.0.1",
-                        "odl-l3vpn:mac_address": "00:00:00:00:00:01",
-                    }
-                ],
-                "vpn-instance-name": "testVpn1",
-                "name": "s1-eth1",
-            },
-            {
-                "odl-l3vpn:adjacency": [
-                    {
-                        "odl-l3vpn:ip_address": "10.0.0.2",
-                        "odl-l3vpn:mac_address": "00:00:00:00:00:02",
-                    }
-                ],
-                "vpn-instance-name": "testVpn2",
-                "name": "s1-eth2",
-            },
-            {
-                "odl-l3vpn:adjacency": [
-                    {
-                        "odl-l3vpn:ip_address": "10.0.0.3",
-                        "odl-l3vpn:mac_address": "00:00:00:00:00:03",
-                    }
-                ],
-                "vpn-instance-name": "testVpn1",
-                "name": "s2-eth1",
-            },
-            {
-                "odl-l3vpn:adjacency": [
-                    {
-                        "odl-l3vpn:ip_address": "10.0.0.4",
-                        "odl-l3vpn:mac_address": "00:00:00:00:00:04",
-                    }
-                ],
-                "vpn-instance-name": "testVpn2",
-                "name": "s2-eth2",
-            },
-        ]
-    }
-    vpn_inst_data = json.dumps(vpn_instances)
-    ietf_int_data = json.dumps(ietf_interfaces)
-    vpn_int_data = json.dumps(vpn_interfaces)
-    variables = {
-        "vpn_instances": vpn_inst_data,
-        "ietf_interfaces": ietf_int_data,
-        "vpn_interfaces": vpn_int_data,
-    }
-    return variables
diff --git a/csit/variables/vpnservice/dissoc_l3vpn/location.uri b/csit/variables/vpnservice/dissoc_l3vpn/location.uri
deleted file mode 100644 (file)
index 887ab40..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/neutronvpn:dissociateNetworks
diff --git a/csit/variables/vpnservice/dissoc_l3vpn/post_data.json b/csit/variables/vpnservice/dissoc_l3vpn/post_data.json
deleted file mode 100644 (file)
index b5c6e66..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "input":{
-      "vpn-id":"$vpnid",
-      "network-id":[
-         "$networkid"
-      ]
-   }
-}
diff --git a/csit/variables/vpnservice/dissoc_two_router_l3vpn/location.uri b/csit/variables/vpnservice/dissoc_two_router_l3vpn/location.uri
deleted file mode 100644 (file)
index 6350e1d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/neutronvpn:dissociateRouter
diff --git a/csit/variables/vpnservice/dissoc_two_router_l3vpn/post_data.json b/csit/variables/vpnservice/dissoc_two_router_l3vpn/post_data.json
deleted file mode 100644 (file)
index 24b57e9..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "input":{
-      "vpn-id":"$vpnid",
-      "router-ids":[
-              {
-               "router-id":"$routerid"
-              }
-       ]
-   }
-}
diff --git a/csit/variables/vpnservice/get_l3vpn/location.uri b/csit/variables/vpnservice/get_l3vpn/location.uri
deleted file mode 100644 (file)
index 7280ef2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/neutronvpn:getL3VPN
diff --git a/csit/variables/vpnservice/get_l3vpn/post_data.json b/csit/variables/vpnservice/get_l3vpn/post_data.json
deleted file mode 100644 (file)
index 9a344b0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "input":{
-      "id":"$vpnid"
-   }
-}
diff --git a/csit/variables/vpnservice/itm_create/location.uri b/csit/variables/vpnservice/itm_create/location.uri
deleted file mode 100644 (file)
index 8a95992..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/config/itm:transport-zones/
diff --git a/csit/variables/vpnservice/itm_create/post_data.json b/csit/variables/vpnservice/itm_create/post_data.json
deleted file mode 100644 (file)
index 6461386..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-   "transport-zone":[
-      {
-         "zone-name":"TZA",
-         "subnets":[
-            {
-               "prefix":"$prefix",
-               "vlan-id":$vlanid,
-               "vteps":[
-                  {
-                     "dpn-id":$dpnid1,
-                     "portname":"$portname1",
-                     "ip-address":"$ipaddress1"
-                  },
-                  {
-                     "dpn-id":$dpnid2,
-                     "portname":"$portname2",
-                     "ip-address":"$ipaddress2"
-                  }
-               ],
-               "gateway-ip":"$gateway"
-            }
-         ],
-         "tunnel-type":"odl-interface:tunnel-type-$tunneltype"
-      }
-   ]
-}
diff --git a/csit/variables/vpnservice/l3vpn_create/location.uri b/csit/variables/vpnservice/l3vpn_create/location.uri
deleted file mode 100644 (file)
index c6776b7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/neutronvpn:createL3VPN
diff --git a/csit/variables/vpnservice/l3vpn_create/post_data.json b/csit/variables/vpnservice/l3vpn_create/post_data.json
deleted file mode 100644 (file)
index 7511509..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-   "input":{
-      "l3vpn":[
-         {
-            "id":"$vpnid",
-            "name":"$name",
-            "route-distinguisher":
-               $rd
-            ,
-            "export-RT":
-               $exportrt
-            ,
-            "import-RT":
-               $importrt
-            ,
-            "tenant-id":"$tenantid"
-            $router
-         }
-      ]
-   }
-}
diff --git a/csit/variables/vpnservice/l3vpn_delete/location.uri b/csit/variables/vpnservice/l3vpn_delete/location.uri
deleted file mode 100644 (file)
index da7ec33..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/neutronvpn:deleteL3VPN
diff --git a/csit/variables/vpnservice/l3vpn_delete/post_data.json b/csit/variables/vpnservice/l3vpn_delete/post_data.json
deleted file mode 100644 (file)
index f521af3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-   "input":{
-      "id":[
-         "$vpnid"
-      ]
-   }
-}
diff --git a/csit/variables/vpnservice/vm_interface.json b/csit/variables/vpnservice/vm_interface.json
deleted file mode 100644 (file)
index 768f291..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "interface": [
-        {
-            "enabled": "true",
-            "name": "s1-eth1",
-            "odl-interface:of-port-id": "openflow:1:1",
-            "type": "iana-if-type:l2vlan"
-        }
-    ]
-}
diff --git a/csit/variables/vpnservice/vm_vpninterface.json b/csit/variables/vpnservice/vm_vpninterface.json
deleted file mode 100644 (file)
index 840a583..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "vpn-interface": [
-        {
-            "name": "s1-eth1",
-            "odl-l3vpn:adjacency": [
-                {
-                    "odl-l3vpn:ip_address": "10.0.0.1",
-                    "odl-l3vpn:mac_address": "12:f8:57:a8:b9:a1"
-                }
-            ],
-            "vpn-instance-name": "testVpn1"
-        }
-    ]
-}
diff --git a/csit/variables/vpnservice/vpn_instance.json b/csit/variables/vpnservice/vpn_instance.json
deleted file mode 100644 (file)
index c6956b7..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "vpn-instance": [
-        {
-            "description": "Test VPN Instance 1",
-            "ipv4-family": {
-                "apply-label": {
-                    "apply-label-per-route": "true"
-                },
-                "export-route-policy": "3000:1,4000:1",
-                "import-route-policy": "1000:1,2000:1",
-                "route-distinguisher": "1000:1"
-            },
-            "vpn-instance-name": "testVpn1"
-        }
-    ]
-}