Tenant name changed to be consistent with CSIT.

Change-Id: I582919e11a262f743512115a8a71cc90ec9c3cc3
Signed-off-by: Dileep <dileep.ranganathan@intel.com>

diff --git a/demos/gbpsfc-env/demo-asymmetric-chain/rest.py b/demos/gbpsfc-env/demo-asymmetric-chain/rest.py
index 6a41d89d4bab1a90f1eca4068ca6eeb701185a62..e2438a1c788c8f51a27d5c8e5f5e3162f74e8f6c 100644 (file)
--- a/demos/gbpsfc-env/demo-asymmetric-chain/rest.py
+++ b/demos/gbpsfc-env/demo-asymmetric-chain/rest.py
@@ -239,7 +239,7 @@ def get_tenant_data():
     return {
         "tenant": [
           {
-            "id": "tenant-dobre",
+            "id": "tenant-red",
             "name": "DockerTenant",
             "forwarding-context": {
               "l2-flood-domain": [
@@ -457,7 +457,7 @@ def get_tenant_data():
 # Main Program
 
 def get_tenant_uri():
-    return "/restconf/config/policy:tenants/policy:tenant/tenant-dobre"
+    return "/restconf/config/policy:tenants/policy:tenant/tenant-red"
 
 def get_tunnel_data_1():
     return {
@@ -530,7 +530,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h36_2",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -546,7 +546,7 @@ def get_endpoint_data():
     }
 ],
 "port-name": "vethl-h35_2",
-"tenant": "tenant-dobre"
+"tenant": "tenant-red"
 }
 },
 {
@@ -566,7 +566,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h35_3",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -586,7 +586,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h36_3",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -606,7 +606,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h36_4",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -626,7 +626,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h35_4",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -646,7 +646,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h35_5",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -666,7 +666,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h36_5",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 }]
 

diff --git a/demos/gbpsfc-env/demo-gbp1/rest.py b/demos/gbpsfc-env/demo-gbp1/rest.py
index b0188ae1d9233d2ce7b2047de4a16d902e33b5cb..35fceb86581f65788556bdad4e62ddaf441bb48e 100644 (file)
--- a/demos/gbpsfc-env/demo-gbp1/rest.py
+++ b/demos/gbpsfc-env/demo-gbp1/rest.py
@@ -58,7 +58,7 @@ def post(host, port, uri, data, debug=False):
 def get_tenant_data():
     return {
         "policy:tenant": {
-          "id": "tenant-dobre",
+          "id": "tenant-red",
           "name": "GBPPOC",
           "forwarding-context": {
             "l2-bridge-domain": [
@@ -253,7 +253,8 @@ def get_tenant_data():
 # Main Program
 
 def get_tenant_uri():
-    return "/restconf/config/policy:tenants/policy:tenant/tenant-dobre"
+    return "/restconf/config/policy:tenants/policy:tenant/tenant-red"
+
 
 def get_tunnel_data():
     return {
@@ -336,7 +337,7 @@ def get_endpoint_data():
             }
         ], 
         "port-name": "vethl-h35_2", 
-        "tenant": "tenant-dobre"
+        "tenant": "tenant-red"
     }
 },
             {
@@ -356,7 +357,7 @@ def get_endpoint_data():
             }
         ], 
         "port-name": "vethl-h35_3", 
-        "tenant": "tenant-dobre"
+        "tenant": "tenant-red"
     }
 },
             {
@@ -376,7 +377,7 @@ def get_endpoint_data():
             }
         ], 
         "port-name": "vethl-h35_4", 
-        "tenant": "tenant-dobre"
+        "tenant": "tenant-red"
     }
 },
             {
@@ -396,7 +397,7 @@ def get_endpoint_data():
             }
         ], 
         "port-name": "vethl-h35_5", 
-        "tenant": "tenant-dobre"
+        "tenant": "tenant-red"
     }
 },
             {
@@ -416,7 +417,7 @@ def get_endpoint_data():
             }
         ], 
         "port-name": "vethl-h36_2", 
-        "tenant": "tenant-dobre"
+        "tenant": "tenant-red"
     }
 },
             {
@@ -436,7 +437,7 @@ def get_endpoint_data():
             }
         ], 
         "port-name": "vethl-h36_3", 
-        "tenant": "tenant-dobre"
+        "tenant": "tenant-red"
     }
 },
             {
@@ -456,7 +457,7 @@ def get_endpoint_data():
             }
         ], 
         "port-name": "vethl-h36_4", 
-        "tenant": "tenant-dobre"
+        "tenant": "tenant-red"
     }
 },{
     "input": {
@@ -475,7 +476,7 @@ def get_endpoint_data():
             }
         ], 
         "port-name": "vethl-h36_5", 
-        "tenant": "tenant-dobre"
+        "tenant": "tenant-red"
     }
 }]
 

diff --git a/demos/gbpsfc-env/demo-symmetric-chain/rest.py b/demos/gbpsfc-env/demo-symmetric-chain/rest.py
index 17d98670b90b3919a270bc238fd392813780678c..edc74553800c99dcffe1aaa4bb7ef201febaa7b8 100644 (file)
--- a/demos/gbpsfc-env/demo-symmetric-chain/rest.py
+++ b/demos/gbpsfc-env/demo-symmetric-chain/rest.py
@@ -241,7 +241,7 @@ def get_tenant_data():
     return {
         "tenant": [
           {
-            "id": "tenant-dobre",
+            "id": "tenant-red",
             "name": "DockerTenant",
             "forwarding-context": {
               "l2-flood-domain": [
@@ -459,7 +459,7 @@ def get_tenant_data():
 # Main Program
 
 def get_tenant_uri():
-    return "/restconf/config/policy:tenants/policy:tenant/tenant-dobre"
+    return "/restconf/config/policy:tenants/policy:tenant/tenant-red"
 
 def get_tunnel_data_1():
     return {
@@ -532,7 +532,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h36_2",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -548,7 +548,7 @@ def get_endpoint_data():
     }
 ],
 "port-name": "vethl-h35_2",
-"tenant": "tenant-dobre"
+"tenant": "tenant-red"
 }
 },
 {
@@ -568,7 +568,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h35_3",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -588,7 +588,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h36_3",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -608,7 +608,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h36_4",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -628,7 +628,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h35_4",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -648,7 +648,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h35_5",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 },
 {
@@ -668,7 +668,7 @@ def get_endpoint_data():
         }
     ],
     "port-name": "vethl-h36_5",
-    "tenant": "tenant-dobre"
+    "tenant": "tenant-red"
 }
 }]
 

diff --git a/demos/gbpsfc-env/rest-clean.py b/demos/gbpsfc-env/rest-clean.py
index 7481066e93477fc75c3f2db104d9a6ff9064f74f..fc64363d13ce2f65fae520eba9b3fabbe72c6a38 100644 (file)
--- a/demos/gbpsfc-env/rest-clean.py
+++ b/demos/gbpsfc-env/rest-clean.py
@@ -61,7 +61,7 @@ def get_service_function_paths_uri():
     return "/restconf/config/service-function-path:service-function-paths/"
 
 def get_tenant_uri():
-    return "/restconf/config/policy:tenants/policy:tenant/f5c7d344-d1c7-4208-8531-2c2693657e12"
+    return "/restconf/config/policy:tenants/policy:tenant/tenant-red"
 
 def get_tunnel_uri():
     return "/restconf/config/opendaylight-inventory:nodes"
@@ -81,7 +81,7 @@ if __name__ == "__main__":
     if controller == None:
         sys.exit("No controller set.")
     else:
-       print "Contacting controller at %s" % controller
+        print "Contacting controller at %s" % controller
 
     resp=get(controller,DEFAULT_PORT,'/restconf/operational/endpoint:endpoints')
     resp_json=json.loads(resp.text)
@@ -108,12 +108,12 @@ if __name__ == "__main__":
 
     print "unregistering L2 endpoints"
     for endpoint in l2_eps:
-       data={ "input": { "l2": [ { "l2-context": endpoint['l2-context'] ,"mac-address": endpoint['mac-address'] } ] } }
+        data={ "input": { "l2": [ { "l2-context": endpoint['l2-context'] ,"mac-address": endpoint['mac-address'] } ] } }
         post(controller, DEFAULT_PORT, get_endpoint_uri(),data,True)
 
     print "unregistering L3 endpoints"
     for endpoint in l3_eps:
-       data={ "input": { "l3": [ { "l3-context": endpoint['l3-context'] ,"ip-address": endpoint['ip-address'] } ] } }
+        data={ "input": { "l3": [ { "l3-context": endpoint['l3-context'] ,"ip-address": endpoint['ip-address'] } ] } }
         post(controller, DEFAULT_PORT, get_endpoint_uri(),data,True)
 
     print "topology removed check"