Change naming to future proof

With next version of odl, I would have
to do this anyway, so might as well just
do it now.

Since it's only test for oxygen and fluorine
right now. It will take .oxygen files
and the default files for other versions.

Change-Id: I0759f73fdf6c837e57878a446ce3d83f0396490b
Signed-off-by: Tomas Markovic <tomas.markovic@pantheon.tech>

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.fluorine/data.json b/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.oxygen/data.json
similarity index 85%
rename from csit/variables/bgpfunctional/bgppolicies/app_peer_rib.fluorine/data.json
rename to csit/variables/bgpfunctional/bgppolicies/app_peer_rib.oxygen/data.json
index 2145c18604d9e00f238fcf488d214ad53e180b3a..be247f1a10167b4c768692569cbd54903d63c812 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.fluorine/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.oxygen/data.json
@@ -15,8 +15,7 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "10.0.0.17/32",
-                "route-key": "10.0.0.17/32"
+                "prefix": "10.0.0.17/32"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.fluorine/location.uri b/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.oxygen/location.uri
similarity index 100%
rename from csit/variables/bgpfunctional/bgppolicies/app_peer_rib.fluorine/location.uri
rename to csit/variables/bgpfunctional/bgppolicies/app_peer_rib.oxygen/location.uri

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_rib/data.json b/csit/variables/bgpfunctional/bgppolicies/app_peer_rib/data.json
index be247f1a10167b4c768692569cbd54903d63c812..2145c18604d9e00f238fcf488d214ad53e180b3a 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/app_peer_rib/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/app_peer_rib/data.json
@@ -15,7 +15,8 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "10.0.0.17/32"
+                "prefix": "10.0.0.17/32",
+                "route-key": "10.0.0.17/32"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_route.fluorine/location.uri b/csit/variables/bgpfunctional/bgppolicies/app_peer_route.oxygen/location.uri
similarity index 100%
rename from csit/variables/bgpfunctional/bgppolicies/app_peer_route.fluorine/location.uri
rename to csit/variables/bgpfunctional/bgppolicies/app_peer_route.oxygen/location.uri

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_route.fluorine/post_data.xml b/csit/variables/bgpfunctional/bgppolicies/app_peer_route.oxygen/post_data.xml
similarity index 91%
rename from csit/variables/bgpfunctional/bgppolicies/app_peer_route.fluorine/post_data.xml
rename to csit/variables/bgpfunctional/bgppolicies/app_peer_route.oxygen/post_data.xml
index 620e2e7ada8559759a54c5362d5a264248633158..ea058a6fab400d3bde8ca71d08cab7c59456b83e 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/app_peer_route.fluorine/post_data.xml
+++ b/csit/variables/bgpfunctional/bgppolicies/app_peer_route.oxygen/post_data.xml
@@ -1,7 +1,6 @@
 <ipv4-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-inet">
     <path-id>0</path-id>
     <prefix>10.0.0.17/32</prefix>
-    <route-key>10.0.0.17/32</route-key>
     <attributes>
         <as-path/>
         <origin>

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_route/post_data.xml b/csit/variables/bgpfunctional/bgppolicies/app_peer_route/post_data.xml
index ea058a6fab400d3bde8ca71d08cab7c59456b83e..620e2e7ada8559759a54c5362d5a264248633158 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/app_peer_route/post_data.xml
+++ b/csit/variables/bgpfunctional/bgppolicies/app_peer_route/post_data.xml
@@ -1,6 +1,7 @@
 <ipv4-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-inet">
     <path-id>0</path-id>
     <prefix>10.0.0.17/32</prefix>
+    <route-key>10.0.0.17/32</route-key>
     <attributes>
         <as-path/>
         <origin>

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.fluorine/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/data.json
similarity index 91%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.fluorine/data.json
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/data.json
index e1fbdb7c8e7e217410cea553727f0195db90a501..bf480535bcc21170467086b6670a83d842891ebf 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.fluorine/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/data.json
@@ -25,8 +25,7 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "1.1.1.0/24",
-                "route-key": "1.1.1.0/24"
+                "prefix": "1.1.1.0/24"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.fluorine/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/location.uri
similarity index 100%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.fluorine/location.uri
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/location.uri

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1/data.json
index bf480535bcc21170467086b6670a83d842891ebf..e1fbdb7c8e7e217410cea553727f0195db90a501 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1/data.json
@@ -25,7 +25,8 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "1.1.1.0/24"
+                "prefix": "1.1.1.0/24",
+                "route-key": "1.1.1.0/24"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.fluorine/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/data.json
similarity index 85%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.fluorine/data.json
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/data.json
index 6a6636c958dc01d29bea521f403bddfefbab1bb8..741b5042c9ec0009b424996fa5d43d5664692de6 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.fluorine/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/data.json
@@ -15,8 +15,7 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "2.1.1.0/24",
-                "route-key": "2.1.1.0/24"
+                "prefix": "2.1.1.0/24"
             },
             {
                 "attributes": {
@@ -32,8 +31,7 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "2.2.1.0/24",
-                "route-key": "2.2.1.0/24"
+                "prefix": "2.2.1.0/24"
             },
             {
                 "attributes": {
@@ -49,8 +47,7 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "2.3.1.0/24",
-                "route-key": "2.3.1.0/24"
+                "prefix": "2.3.1.0/24"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.fluorine/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/location.uri
similarity index 100%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.fluorine/location.uri
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/location.uri

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2/data.json
index 741b5042c9ec0009b424996fa5d43d5664692de6..6a6636c958dc01d29bea521f403bddfefbab1bb8 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2/data.json
@@ -15,7 +15,8 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "2.1.1.0/24"
+                "prefix": "2.1.1.0/24",
+                "route-key": "2.1.1.0/24"
             },
             {
                 "attributes": {
@@ -31,7 +32,8 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "2.2.1.0/24"
+                "prefix": "2.2.1.0/24",
+                "route-key": "2.2.1.0/24"
             },
             {
                 "attributes": {
@@ -47,7 +49,8 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "2.3.1.0/24"
+                "prefix": "2.3.1.0/24",
+                "route-key": "2.3.1.0/24"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.fluorine/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/data.json
similarity index 93%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.fluorine/data.json
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/data.json
index 4cdf51d550651a7d45c8878499ecf901e9a80c82..4ea2e36aa0fd799a6ff7cbc86c97a0e01df900ce 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.fluorine/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/data.json
@@ -9,8 +9,7 @@
                                 "as-sequence": [
                                     35000,
                                     60000,
-                                    64000,
-                                    64496
+                                    64000
                                 ]
                             }
                         ]
@@ -42,7 +41,6 @@
                         "label-value": 256
                     }
                 ],
-                "path-id": 0,
                 "prefix": "103.36.0.0/24",
                 "route-distinguisher": "0:3548:478513974",
                 "route-key": "WAAADdwchYs2ZyQA"

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.fluorine/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/location.uri
similarity index 100%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.fluorine/location.uri
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/location.uri

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3/data.json
index 4ea2e36aa0fd799a6ff7cbc86c97a0e01df900ce..4cdf51d550651a7d45c8878499ecf901e9a80c82 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3/data.json
@@ -9,7 +9,8 @@
                                 "as-sequence": [
                                     35000,
                                     60000,
-                                    64000
+                                    64000,
+                                    64496
                                 ]
                             }
                         ]
@@ -41,6 +42,7 @@
                         "label-value": 256
                     }
                 ],
+                "path-id": 0,
                 "prefix": "103.36.0.0/24",
                 "route-distinguisher": "0:3548:478513974",
                 "route-key": "WAAADdwchYs2ZyQA"

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.fluorine/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/data.json
similarity index 65%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.fluorine/data.json
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/data.json
index b07b4d58d8944e8a9bbb868d4191842017677a0a..5abf3e9d7b74d58c59350e847550c8e4f3487896 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.fluorine/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/data.json
@@ -3,15 +3,7 @@
         "ipv4-route": [
             {
                 "attributes": {
-                    "as-path": {
-                        "segments": [
-                            {
-                                "as-sequence": [
-                                    64496
-                                ]
-                            }
-                        ]
-                    },
+                    "as-path": {},
                     "communities": [
                         {
                             "as-number": 30740,
@@ -30,8 +22,7 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "4.1.1.0/24",
-                "route-key": "4.1.1.0/24"
+                "prefix": "4.1.1.0/24"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.fluorine/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/location.uri
similarity index 100%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.fluorine/location.uri
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/location.uri

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4/data.json
index 5abf3e9d7b74d58c59350e847550c8e4f3487896..b07b4d58d8944e8a9bbb868d4191842017677a0a 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4/data.json
@@ -3,7 +3,15 @@
         "ipv4-route": [
             {
                 "attributes": {
-                    "as-path": {},
+                    "as-path": {
+                        "segments": [
+                            {
+                                "as-sequence": [
+                                    64496
+                                ]
+                            }
+                        ]
+                    },
                     "communities": [
                         {
                             "as-number": 30740,
@@ -22,7 +30,8 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "4.1.1.0/24"
+                "prefix": "4.1.1.0/24",
+                "route-key": "4.1.1.0/24"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.fluorine/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/data.json
similarity index 91%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.fluorine/data.json
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/data.json
index ade0d2635364176e523f35513b3d9c4d92c122b0..6c33bd3b938e0d3279e5d9bd0eab5d022cac96dd 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.fluorine/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/data.json
@@ -24,8 +24,7 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "5.1.1.0/24",
-                "route-key": "5.1.1.0/24"
+                "prefix": "5.1.1.0/24"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.fluorine/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/location.uri
similarity index 100%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.fluorine/location.uri
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/location.uri

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5/data.json
index 6c33bd3b938e0d3279e5d9bd0eab5d022cac96dd..ade0d2635364176e523f35513b3d9c4d92c122b0 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5/data.json
@@ -24,7 +24,8 @@
                     }
                 },
                 "path-id": 0,
-                "prefix": "5.1.1.0/24"
+                "prefix": "5.1.1.0/24",
+                "route-key": "5.1.1.0/24"
             }
         ]
     }

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.fluorine/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/data.json
similarity index 98%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.fluorine/data.json
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/data.json
index 0d7e9bf6c14a1410ab14f5a61d2f48ad9e7ff97c..cd048b280adda0fbdf5ec7bbe8e0e0663d6b4d4f 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.fluorine/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/data.json
@@ -47,7 +47,6 @@
                         "label-value": 926
                     }
                 ],
-                "path-id": 0,
                 "prefix": "2001:4b50:20c0::/48",
                 "route-distinguisher": "0:3215:583457597",
                 "route-key": "cAAADI8ixts9IAFLUCDA"

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.fluorine/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/location.uri
similarity index 100%
rename from csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.fluorine/location.uri
rename to csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/location.uri

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6/data.json
index cd048b280adda0fbdf5ec7bbe8e0e0663d6b4d4f..0d7e9bf6c14a1410ab14f5a61d2f48ad9e7ff97c 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6/data.json
@@ -47,6 +47,7 @@
                         "label-value": 926
                     }
                 ],
+                "path-id": 0,
                 "prefix": "2001:4b50:20c0::/48",
                 "route-distinguisher": "0:3215:583457597",
                 "route-key": "cAAADI8ixts9IAFLUCDA"