Switch to use new ovs nsh version

https://github.com/yyang13/ovs_nsh_patches

ovs 2.5.90 commit 7d433ae57ebb90cd68e8fa948a096f619ac4e2d8 + Intel NSH and VxLAN-gpe patches

Change-Id: If15e1af18f28f76567ac2591db30ac719ed072ca
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

diff --git a/demos/gbpsfc-env/Vagrantfile b/demos/gbpsfc-env/Vagrantfile
index 65c3025c28a1118db383121a69326d4a629ef9a9..fd94b9f8989759ab43ce8184aa7ae206e1493f85 100644 (file)
--- a/demos/gbpsfc-env/Vagrantfile
+++ b/demos/gbpsfc-env/Vagrantfile
@@ -1,4 +1,3 @@
-
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
@@ -8,6 +7,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     vb.memory = "512"
   end
   # run our bootstrapping for the system
+  config.vm.provision 'shell', path: 'bootstrap.sh', :args => odl
   num_nodes = (ENV['NUM_NODES'] || 1).to_i
 
   # ip configuration
@@ -22,16 +22,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       vm_ip = ips[n]
       vm_ip_sflow = ips_sflow[n]
       vm_index = n+1
-      compute.vm.box = "alagalah/gbpsfc-trusty64"
-      compute.vm.box_version = "1.0.1"
+      compute.vm.box = "ubuntu/trusty64"
+      compute.vm.box_version = "20160729.0.0"
       compute.vm.hostname = "gbpsfc#{vm_index}"
       compute.vm.network "private_network", ip: "#{vm_ip}"
       compute.vm.network "private_network", ip: "#{vm_ip_sflow}"
       compute.vm.provider :virtualbox do |vb|
-        vb.memory = 512
-        vb.customize ["modifyvm", :id, "--ioapic", "on"]      
+        vb.memory = 2048
+        vb.customize ["modifyvm", :id, "--ioapic", "on"]
         vb.cpus = 1
       end
     end
   end
-end
+end
\ No newline at end of file

diff --git a/demos/gbpsfc-env/bootstrap.sh b/demos/gbpsfc-env/bootstrap.sh
index dbc43b909d3c1e1dfffa054ea9a371652fc5d9d6..d116d797cf449f43c0f4e98863ae74bf855037ce 100755 (executable)
--- a/demos/gbpsfc-env/bootstrap.sh
+++ b/demos/gbpsfc-env/bootstrap.sh
@@ -20,7 +20,7 @@ EOL
 
 docker pull alagalah/odlpoc_ovs230
 # OVS
-curl https://raw.githubusercontent.com/pritesh/ovs/nsh-v8/third-party/start-ovs-deb.sh | bash
+curl https://raw.githubusercontent.com/yyang13/ovs_nsh_patches/master/start-ovs-deb.sh | bash
 
 # this part is just for local spinup DON'T copy it to releng bootstrap.sh
 pip install ipaddr

diff --git a/demos/gbpsfc-env/demo-asymmetric-chain/get-nsps.py b/demos/gbpsfc-env/demo-asymmetric-chain/get-nsps.py
index 9fb91cb05597d24113167aec0517b555ee0f632d..06393350bb8d191d58a0976bb3d9757520082be5 100755 (executable)
--- a/demos/gbpsfc-env/demo-asymmetric-chain/get-nsps.py
+++ b/demos/gbpsfc-env/demo-asymmetric-chain/get-nsps.py
@@ -4,6 +4,7 @@ import requests,json
 from requests.auth import HTTPBasicAuth
 import sys
 import os
+import time
 from subprocess import check_output
 from infrastructure_config import *
 
@@ -13,9 +14,14 @@ USERNAME='admin'
 PASSWORD='admin'
 
 def get(host, port, uri):
+    proxies = {
+        "http": None,
+        "https": None
+    }
+
     url='http://'+host+":"+port+uri
     #print url
-    r = requests.get(url, auth=HTTPBasicAuth(USERNAME, PASSWORD))
+    r = requests.get(url, proxies=proxies, auth=HTTPBasicAuth(USERNAME, PASSWORD))
     jsondata=json.loads(r.text)
     return jsondata
 

diff --git a/demos/gbpsfc-env/demo-asymmetric-chain/infrastructure_config.py b/demos/gbpsfc-env/demo-asymmetric-chain/infrastructure_config.py
index efdcfc98f5c6a728c86be2e32d273aaeb1a6cb37..2662654efb6ad34a6c5cd86a37719fd7ecc4b9c1 100755 (executable)
--- a/demos/gbpsfc-env/demo-asymmetric-chain/infrastructure_config.py
+++ b/demos/gbpsfc-env/demo-asymmetric-chain/infrastructure_config.py
@@ -30,35 +30,35 @@ defaultContainerImage='alagalah/odlpoc_ovs230'
 
 #Note that tenant name and endpointGroup name come from policy_config.py
 
-hosts = [{'name': 'h35_2',
+hosts = [{'name': 'h35-2',
           'mac': '00:00:00:00:35:02',
           'ip': '10.0.35.2/24',
           'switch': 'sw1'},
-         {'name': 'h35_3',
+         {'name': 'h35-3',
           'ip': '10.0.35.3/24',
           'mac': '00:00:00:00:35:03',
           'switch': 'sw1'},
-         {'name': 'h35_4',
+         {'name': 'h35-4',
           'ip': '10.0.35.4/24',
           'mac': '00:00:00:00:35:04',
           'switch': 'sw6'},
-         {'name': 'h35_5',
+         {'name': 'h35-5',
           'ip': '10.0.35.5/24',
           'mac': '00:00:00:00:35:05',
           'switch': 'sw6'},
-         {'name': 'h36_2',
+         {'name': 'h36-2',
           'ip': '10.0.36.2/24',
           'mac': '00:00:00:00:36:02',
           'switch': 'sw1'},
-         {'name': 'h36_3',
+         {'name': 'h36-3',
           'ip': '10.0.36.3/24',
           'mac': '00:00:00:00:36:03',
           'switch': 'sw1'},
-         {'name': 'h36_4',
+         {'name': 'h36-4',
           'ip': '10.0.36.4/24',
           'mac': '00:00:00:00:36:04',
           'switch': 'sw6'},
-         {'name': 'h36_5',
+         {'name': 'h36-5',
           'ip': '10.0.36.5/24',
           'mac': '00:00:00:00:36:05',
           'switch': 'sw6'}

diff --git a/demos/gbpsfc-env/demo-asymmetric-chain/rest.py b/demos/gbpsfc-env/demo-asymmetric-chain/rest.py
index baf88ba840d5b2b59a26637dfb5573fd932532d9..f88cc6e29f82bb5dc2e1ac4594597ace888b9492 100755 (executable)
--- a/demos/gbpsfc-env/demo-asymmetric-chain/rest.py
+++ b/demos/gbpsfc-env/demo-asymmetric-chain/rest.py
@@ -138,6 +138,7 @@ def get_service_function_forwarders_data():
                             "ip": "192.168.50.71"
                         },
                         "service-function-forwarder-ovs:ovs-options": {
+                            "exts": "gpe",
                             "remote-ip": "flow",
                             "dst-port": "6633",
                             "key": "flow",
@@ -175,6 +176,7 @@ def get_service_function_forwarders_data():
                             "ip": "192.168.50.73"
                         },
                         "service-function-forwarder-ovs:ovs-options": {
+                            "exts": "gpe",
                             "remote-ip": "flow",
                             "dst-port": "6633",
                             "key": "flow",
@@ -535,7 +537,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_2",
+    "port-name": "vethl-h36-2",
     "tenant": "tenant-red"
 }
 },
@@ -551,7 +553,7 @@ def get_endpoint_data():
         "l3-context": "l3-context-vrf-red"
     }
 ],
-"port-name": "vethl-h35_2",
+"port-name": "vethl-h35-2",
 "tenant": "tenant-red"
 }
 },
@@ -571,7 +573,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_3",
+    "port-name": "vethl-h35-3",
     "tenant": "tenant-red"
 }
 },
@@ -591,7 +593,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_3",
+    "port-name": "vethl-h36-3",
     "tenant": "tenant-red"
 }
 },
@@ -611,7 +613,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_4",
+    "port-name": "vethl-h36-4",
     "tenant": "tenant-red"
 }
 },
@@ -631,7 +633,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_4",
+    "port-name": "vethl-h35-4",
     "tenant": "tenant-red"
 }
 },
@@ -651,7 +653,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_5",
+    "port-name": "vethl-h35-5",
     "tenant": "tenant-red"
 }
 },
@@ -671,7 +673,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_5",
+    "port-name": "vethl-h36-5",
     "tenant": "tenant-red"
 }
 }]

diff --git a/demos/gbpsfc-env/demo-asymmetric-chain/sf-config.sh b/demos/gbpsfc-env/demo-asymmetric-chain/sf-config.sh
index b06a7564345e550bde4aa7e8b4e1eccca0874384..5f73540f814375ee04f6d6f80633db170bebacc1 100755 (executable)
--- a/demos/gbpsfc-env/demo-asymmetric-chain/sf-config.sh
+++ b/demos/gbpsfc-env/demo-asymmetric-chain/sf-config.sh
@@ -14,4 +14,4 @@ else
 fi
 
 sudo ovs-vsctl add-br $sw
-sudo ovs-vsctl add-port $sw $sw-vxlangpe-0 -- set interface $sw-vxlangpe-0 type=vxlan options:remote_ip=flow options:dst_port=6633 options:nshc1=flow options:nshc2=flow options:nshc3=flow options:nshc4=flow options:nsp=flow options:nsi=flow options:key=flow
+sudo ovs-vsctl add-port $sw $sw-vxlangpe-0 -- set interface $sw-vxlangpe-0 type=vxlan options:exts=gpe options:remote_ip=flow options:dst_port=6633 options:nshc1=flow options:nshc2=flow options:nshc3=flow options:nshc4=flow options:nsp=flow options:nsi=flow options:key=flow

diff --git a/demos/gbpsfc-env/demo-asymmetric-chain/sf-flows.sh b/demos/gbpsfc-env/demo-asymmetric-chain/sf-flows.sh
index f4ee6497d240d311173070518c85933a15761b21..b7816c223bc2a2deded2389f2707f4e51fbae32d 100755 (executable)
--- a/demos/gbpsfc-env/demo-asymmetric-chain/sf-flows.sh
+++ b/demos/gbpsfc-env/demo-asymmetric-chain/sf-flows.sh
@@ -16,5 +16,5 @@ fi
 # delete NORMAL, if present
 nsphex=`printf "%x\n" $nsp`
 sudo ovs-ofctl --strict del-flows $sw priority=0
-sudo ovs-ofctl add-flow $sw "priority=1000,nsi=255 actions=move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],set_nsi:254,IN_PORT" -OOpenFlow13
-sudo ovs-ofctl add-flow $sw "priority=1000,nsi=254 actions=move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],set_nsi:253,IN_PORT" -OOpenFlow13
+sudo ovs-ofctl add-flow $sw "priority=1000,nsi=255 actions=move:NXM_NX_NSH_MDTYPE[]->NXM_NX_NSH_MDTYPE[],move:NXM_NX_NSH_NP[]->NXM_NX_NSH_NP[],move:NXM_NX_NSP[]->NXM_NX_NSP[],load:254->NXM_NX_NSI[],move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],load:0x4->NXM_NX_TUN_GPE_NP[],IN_PORT" -OOpenFlow13
+sudo ovs-ofctl add-flow $sw "priority=1000,nsi=254 actions=move:NXM_NX_NSH_MDTYPE[]->NXM_NX_NSH_MDTYPE[],move:NXM_NX_NSH_NP[]->NXM_NX_NSH_NP[],move:NXM_NX_NSP[]->NXM_NX_NSP[],load:253->NXM_NX_NSI[],move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],load:0x4->NXM_NX_TUN_GPE_NP[],IN_PORT" -OOpenFlow13

diff --git a/demos/gbpsfc-env/demo-asymmetric-coexistence/infrastructure_config.py b/demos/gbpsfc-env/demo-asymmetric-coexistence/infrastructure_config.py
index 14b98d0fb0940c7a6169675ab31f39723cec9ead..155f1c8cc09a0a659bf200bb6ec89fb2977ead9c 100755 (executable)
--- a/demos/gbpsfc-env/demo-asymmetric-coexistence/infrastructure_config.py
+++ b/demos/gbpsfc-env/demo-asymmetric-coexistence/infrastructure_config.py
@@ -24,27 +24,27 @@ defaultContainerImage='alagalah/odlpoc_ovs230'
 
 #Note that tenant name and endpointGroup name come from policy_config.py
 
-hosts = [{'name': 'h35_2',
+hosts = [{'name': 'h35-2',
           'mac': '00:00:00:00:35:02',
           'ip': '10.0.35.2/24',
           'switch': 'sw1'},
-         {'name': 'h35_3',
+         {'name': 'h35-3',
           'ip': '10.0.35.3/24',
           'mac': '00:00:00:00:35:03',
           'switch': 'sw2'},
-         {'name': 'h35_4',
+         {'name': 'h35-4',
           'ip': '10.0.35.4/24',
           'mac': '00:00:00:00:35:04',
           'switch': 'sw4'},
-         {'name': 'h36_2',
+         {'name': 'h36-2',
           'ip': '10.0.36.2/24',
           'mac': '00:00:00:00:36:02',
           'switch': 'sw1'},
-         {'name': 'h36_3',
+         {'name': 'h36-3',
           'ip': '10.0.36.3/24',
           'mac': '00:00:00:00:36:03',
           'switch': 'sw2'},
-         {'name': 'h36_4',
+         {'name': 'h36-4',
           'ip': '10.0.36.4/24',
           'mac': '00:00:00:00:36:04',
           'switch': 'sw4'}

diff --git a/demos/gbpsfc-env/demo-asymmetric-coexistence/rest.py b/demos/gbpsfc-env/demo-asymmetric-coexistence/rest.py
index 41264d665b54cc4a1149e7027c6548338659b10c..224247ed1e31846edbce22805bb80bc408fd6eab 100755 (executable)
--- a/demos/gbpsfc-env/demo-asymmetric-coexistence/rest.py
+++ b/demos/gbpsfc-env/demo-asymmetric-coexistence/rest.py
@@ -535,7 +535,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_2",
+    "port-name": "vethl-h36-2",
     "tenant": "tenant-red"
 }
 },
@@ -551,7 +551,7 @@ def get_endpoint_data():
         "l3-context": "l3-context-vrf-red"
     }
 ],
-"port-name": "vethl-h35_2",
+"port-name": "vethl-h35-2",
 "tenant": "tenant-red"
 }
 },
@@ -571,7 +571,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_3",
+    "port-name": "vethl-h35-3",
     "tenant": "tenant-red"
 }
 },
@@ -591,7 +591,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_3",
+    "port-name": "vethl-h36-3",
     "tenant": "tenant-red"
 }
 },
@@ -611,7 +611,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_4",
+    "port-name": "vethl-h36-4",
     "tenant": "tenant-red"
 }
 },
@@ -631,7 +631,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_4",
+    "port-name": "vethl-h35-4",
     "tenant": "tenant-red"
 }
 },
@@ -651,7 +651,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_5",
+    "port-name": "vethl-h35-5",
     "tenant": "tenant-red"
 }
 },
@@ -671,7 +671,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_5",
+    "port-name": "vethl-h36-5",
     "tenant": "tenant-red"
 }
 }]

diff --git a/demos/gbpsfc-env/demo-gbp1/infrastructure_config.py b/demos/gbpsfc-env/demo-gbp1/infrastructure_config.py
index a05ecf610fe56816e99add3e645d04ef3dd917b0..7c21da86dd3312fa685144719972efde3af4d6c2 100755 (executable)
--- a/demos/gbpsfc-env/demo-gbp1/infrastructure_config.py
+++ b/demos/gbpsfc-env/demo-gbp1/infrastructure_config.py
@@ -31,35 +31,35 @@ defaultContainerImage='alagalah/odlpoc_ovs230'
 
 #Note that tenant name and endpointGroup name come from policy_config.py
 
-hosts = [{'name': 'h35_2',
+hosts = [{'name': 'h35-2',
           'mac': '00:00:00:00:35:02',
           'ip': '10.0.35.2/24',
           'switch': 'sw1'},
-         {'name': 'h35_3',
+         {'name': 'h35-3',
           'ip': '10.0.35.3/24',
           'mac': '00:00:00:00:35:03',
           'switch': 'sw2'},
-         {'name': 'h35_4',
+         {'name': 'h35-4',
           'ip': '10.0.35.4/24',
           'mac': '00:00:00:00:35:04',
           'switch': 'sw3'},
-         {'name': 'h35_5',
+         {'name': 'h35-5',
           'ip': '10.0.35.5/24',
           'mac': '00:00:00:00:35:05',
           'switch': 'sw1'},
-         {'name': 'h36_2',
+         {'name': 'h36-2',
           'ip': '10.0.36.2/24',
           'mac': '00:00:00:00:36:02',
           'switch': 'sw2'},
-         {'name': 'h36_3',
+         {'name': 'h36-3',
           'ip': '10.0.36.3/24',
           'mac': '00:00:00:00:36:03',
           'switch': 'sw3'},
-         {'name': 'h36_4',
+         {'name': 'h36-4',
           'ip': '10.0.36.4/24',
           'mac': '00:00:00:00:36:04',
           'switch': 'sw1'},
-         {'name': 'h36_5',
+         {'name': 'h36-5',
           'ip': '10.0.36.5/24',
           'mac': '00:00:00:00:36:05',
           'switch': 'sw2'}

diff --git a/demos/gbpsfc-env/demo-gbp1/rest.py b/demos/gbpsfc-env/demo-gbp1/rest.py
index 7c7f4993e9d11c3e64f5d891a24e1e14674d1546..a4137aaea4be3e5310585166125cc6ee2d978442 100755 (executable)
--- a/demos/gbpsfc-env/demo-gbp1/rest.py
+++ b/demos/gbpsfc-env/demo-gbp1/rest.py
@@ -342,7 +342,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h35_2",
+        "port-name": "vethl-h35-2",
         "tenant": "tenant-red"
     }
 },
@@ -362,7 +362,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h35_3",
+        "port-name": "vethl-h35-3",
         "tenant": "tenant-red"
     }
 },
@@ -382,7 +382,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h35_4",
+        "port-name": "vethl-h35-4",
         "tenant": "tenant-red"
     }
 },
@@ -402,7 +402,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h35_5",
+        "port-name": "vethl-h35-5",
         "tenant": "tenant-red"
     }
 },
@@ -422,7 +422,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h36_2",
+        "port-name": "vethl-h36-2",
         "tenant": "tenant-red"
     }
 },
@@ -442,7 +442,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h36_3",
+        "port-name": "vethl-h36-3",
         "tenant": "tenant-red"
     }
 },
@@ -462,7 +462,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h36_4",
+        "port-name": "vethl-h36-4",
         "tenant": "tenant-red"
     }
 },{
@@ -481,7 +481,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h36_5",
+        "port-name": "vethl-h36-5",
         "tenant": "tenant-red"
     }
 }]

diff --git a/demos/gbpsfc-env/demo-gbp2/infrastructure_config.py b/demos/gbpsfc-env/demo-gbp2/infrastructure_config.py
index 09eb1f927cf8f007a09b22b5d12048996012ec7b..daf0edcf2c8e0d39d6acfe27f2094c6a535954e3 100755 (executable)
--- a/demos/gbpsfc-env/demo-gbp2/infrastructure_config.py
+++ b/demos/gbpsfc-env/demo-gbp2/infrastructure_config.py
@@ -31,35 +31,35 @@ defaultContainerImage='alagalah/odlpoc_ovs230'
 
 #Note that tenant name and endpointGroup name come from policy_config.py
 
-hosts = [{'name': 'h35_2',
+hosts = [{'name': 'h35-2',
           'mac': '00:00:00:00:35:02',
           'ip': '10.0.35.2/24',
           'switch': 'sw1'},
-         {'name': 'h35_3',
+         {'name': 'h35-3',
           'ip': '10.0.35.3/24',
           'mac': '00:00:00:00:35:03',
           'switch': 'sw1'},
-         {'name': 'h35_4',
+         {'name': 'h35-4',
           'ip': '10.0.35.4/24',
           'mac': '00:00:00:00:35:04',
           'switch': 'sw1'},
-         {'name': 'h35_5',
+         {'name': 'h35-5',
           'ip': '10.0.35.5/24',
           'mac': '00:00:00:00:35:05',
           'switch': 'sw1'},
-         {'name': 'h36_2',
+         {'name': 'h36-2',
           'ip': '10.0.36.2/24',
           'mac': '00:00:00:00:36:02',
           'switch': 'sw2'},
-         {'name': 'h36_3',
+         {'name': 'h36-3',
           'ip': '10.0.36.3/24',
           'mac': '00:00:00:00:36:03',
           'switch': 'sw2'},
-         {'name': 'h36_4',
+         {'name': 'h36-4',
           'ip': '10.0.36.4/24',
           'mac': '00:00:00:00:36:04',
           'switch': 'sw2'},
-         {'name': 'h36_5',
+         {'name': 'h36-5',
           'ip': '10.0.36.5/24',
           'mac': '00:00:00:00:36:05',
           'switch': 'sw2'}

diff --git a/demos/gbpsfc-env/demo-gbp2/rest.py b/demos/gbpsfc-env/demo-gbp2/rest.py
index d08aa82c9dde603b5f689907f9e9deda588abbd0..ee18799fef49f8144402c1394fa1380a36b710fb 100755 (executable)
--- a/demos/gbpsfc-env/demo-gbp2/rest.py
+++ b/demos/gbpsfc-env/demo-gbp2/rest.py
@@ -354,7 +354,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h35_2",
+        "port-name": "vethl-h35-2",
         "tenant": "tenant-red"
     }
 },
@@ -374,7 +374,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h35_3",
+        "port-name": "vethl-h35-3",
         "tenant": "tenant-red"
     }
 },
@@ -394,7 +394,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h35_4",
+        "port-name": "vethl-h35-4",
         "tenant": "tenant-red"
     }
 },
@@ -414,7 +414,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h35_5",
+        "port-name": "vethl-h35-5",
         "tenant": "tenant-red"
     }
 },
@@ -434,7 +434,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h36_2",
+        "port-name": "vethl-h36-2",
         "tenant": "tenant-red"
     }
 },
@@ -454,7 +454,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h36_3",
+        "port-name": "vethl-h36-3",
         "tenant": "tenant-red"
     }
 },
@@ -474,7 +474,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h36_4",
+        "port-name": "vethl-h36-4",
         "tenant": "tenant-red"
     }
 },{
@@ -493,7 +493,7 @@ def get_endpoint_data():
                 "l3-context": "l3-context-vrf-red"
             }
         ],
-        "port-name": "vethl-h36_5",
+        "port-name": "vethl-h36-5",
         "tenant": "tenant-red"
     }
 }]

diff --git a/demos/gbpsfc-env/demo-symmetric-chain/get-nsps.py b/demos/gbpsfc-env/demo-symmetric-chain/get-nsps.py
index 4850dcf6fe7e79591f80943296b82833a7d99d8d..836b046f2dae5fc581d8ebee96f13467e6ef0d55 100755 (executable)
--- a/demos/gbpsfc-env/demo-symmetric-chain/get-nsps.py
+++ b/demos/gbpsfc-env/demo-symmetric-chain/get-nsps.py
@@ -4,6 +4,7 @@ import requests,json
 from requests.auth import HTTPBasicAuth
 import sys
 import os
+import time
 from subprocess import check_output
 from infrastructure_config import *
 
@@ -13,9 +14,14 @@ USERNAME='admin'
 PASSWORD='admin'
 
 def get(host, port, uri):
+    proxies = {
+        "http": None,
+        "https": None
+    }
+
     url='http://'+host+":"+port+uri
     #print url
-    r = requests.get(url, auth=HTTPBasicAuth(USERNAME, PASSWORD))
+    r = requests.get(url, proxies=proxies, auth=HTTPBasicAuth(USERNAME, PASSWORD))
     jsondata=json.loads(r.text)
     return jsondata
 

diff --git a/demos/gbpsfc-env/demo-symmetric-chain/infrastructure_config.py b/demos/gbpsfc-env/demo-symmetric-chain/infrastructure_config.py
index efdcfc98f5c6a728c86be2e32d273aaeb1a6cb37..2662654efb6ad34a6c5cd86a37719fd7ecc4b9c1 100755 (executable)
--- a/demos/gbpsfc-env/demo-symmetric-chain/infrastructure_config.py
+++ b/demos/gbpsfc-env/demo-symmetric-chain/infrastructure_config.py
@@ -30,35 +30,35 @@ defaultContainerImage='alagalah/odlpoc_ovs230'
 
 #Note that tenant name and endpointGroup name come from policy_config.py
 
-hosts = [{'name': 'h35_2',
+hosts = [{'name': 'h35-2',
           'mac': '00:00:00:00:35:02',
           'ip': '10.0.35.2/24',
           'switch': 'sw1'},
-         {'name': 'h35_3',
+         {'name': 'h35-3',
           'ip': '10.0.35.3/24',
           'mac': '00:00:00:00:35:03',
           'switch': 'sw1'},
-         {'name': 'h35_4',
+         {'name': 'h35-4',
           'ip': '10.0.35.4/24',
           'mac': '00:00:00:00:35:04',
           'switch': 'sw6'},
-         {'name': 'h35_5',
+         {'name': 'h35-5',
           'ip': '10.0.35.5/24',
           'mac': '00:00:00:00:35:05',
           'switch': 'sw6'},
-         {'name': 'h36_2',
+         {'name': 'h36-2',
           'ip': '10.0.36.2/24',
           'mac': '00:00:00:00:36:02',
           'switch': 'sw1'},
-         {'name': 'h36_3',
+         {'name': 'h36-3',
           'ip': '10.0.36.3/24',
           'mac': '00:00:00:00:36:03',
           'switch': 'sw1'},
-         {'name': 'h36_4',
+         {'name': 'h36-4',
           'ip': '10.0.36.4/24',
           'mac': '00:00:00:00:36:04',
           'switch': 'sw6'},
-         {'name': 'h36_5',
+         {'name': 'h36-5',
           'ip': '10.0.36.5/24',
           'mac': '00:00:00:00:36:05',
           'switch': 'sw6'}

diff --git a/demos/gbpsfc-env/demo-symmetric-chain/rest.py b/demos/gbpsfc-env/demo-symmetric-chain/rest.py
index c22c322d44cc19ff91796dfd1e1a30d63fa65c18..11f55dff394775cfea2e883f0aa23608bcea1f59 100755 (executable)
--- a/demos/gbpsfc-env/demo-symmetric-chain/rest.py
+++ b/demos/gbpsfc-env/demo-symmetric-chain/rest.py
@@ -140,6 +140,7 @@ def get_service_function_forwarders_data():
                             "ip": "192.168.50.71"
                         },
                         "service-function-forwarder-ovs:ovs-options": {
+                            "exts": "gpe",
                             "remote-ip": "flow",
                             "dst-port": "6633",
                             "key": "flow",
@@ -177,6 +178,7 @@ def get_service_function_forwarders_data():
                             "ip": "192.168.50.73"
                         },
                         "service-function-forwarder-ovs:ovs-options": {
+                            "exts": "gpe",
                             "remote-ip": "flow",
                             "dst-port": "6633",
                             "key": "flow",
@@ -537,7 +539,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_2",
+    "port-name": "vethl-h36-2",
     "tenant": "tenant-red"
 }
 },
@@ -553,7 +555,7 @@ def get_endpoint_data():
         "l3-context": "l3-context-vrf-red"
     }
 ],
-"port-name": "vethl-h35_2",
+"port-name": "vethl-h35-2",
 "tenant": "tenant-red"
 }
 },
@@ -573,7 +575,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_3",
+    "port-name": "vethl-h35-3",
     "tenant": "tenant-red"
 }
 },
@@ -593,7 +595,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_3",
+    "port-name": "vethl-h36-3",
     "tenant": "tenant-red"
 }
 },
@@ -613,7 +615,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_4",
+    "port-name": "vethl-h36-4",
     "tenant": "tenant-red"
 }
 },
@@ -633,7 +635,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_4",
+    "port-name": "vethl-h35-4",
     "tenant": "tenant-red"
 }
 },
@@ -653,7 +655,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_5",
+    "port-name": "vethl-h35-5",
     "tenant": "tenant-red"
 }
 },
@@ -673,7 +675,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_5",
+    "port-name": "vethl-h36-5",
     "tenant": "tenant-red"
 }
 }]

diff --git a/demos/gbpsfc-env/demo-symmetric-chain/sf-config.sh b/demos/gbpsfc-env/demo-symmetric-chain/sf-config.sh
index b06a7564345e550bde4aa7e8b4e1eccca0874384..5f73540f814375ee04f6d6f80633db170bebacc1 100755 (executable)
--- a/demos/gbpsfc-env/demo-symmetric-chain/sf-config.sh
+++ b/demos/gbpsfc-env/demo-symmetric-chain/sf-config.sh
@@ -14,4 +14,4 @@ else
 fi
 
 sudo ovs-vsctl add-br $sw
-sudo ovs-vsctl add-port $sw $sw-vxlangpe-0 -- set interface $sw-vxlangpe-0 type=vxlan options:remote_ip=flow options:dst_port=6633 options:nshc1=flow options:nshc2=flow options:nshc3=flow options:nshc4=flow options:nsp=flow options:nsi=flow options:key=flow
+sudo ovs-vsctl add-port $sw $sw-vxlangpe-0 -- set interface $sw-vxlangpe-0 type=vxlan options:exts=gpe options:remote_ip=flow options:dst_port=6633 options:nshc1=flow options:nshc2=flow options:nshc3=flow options:nshc4=flow options:nsp=flow options:nsi=flow options:key=flow

diff --git a/demos/gbpsfc-env/demo-symmetric-chain/sf-flows.sh b/demos/gbpsfc-env/demo-symmetric-chain/sf-flows.sh
index f4ee6497d240d311173070518c85933a15761b21..b7816c223bc2a2deded2389f2707f4e51fbae32d 100755 (executable)
--- a/demos/gbpsfc-env/demo-symmetric-chain/sf-flows.sh
+++ b/demos/gbpsfc-env/demo-symmetric-chain/sf-flows.sh
@@ -16,5 +16,5 @@ fi
 # delete NORMAL, if present
 nsphex=`printf "%x\n" $nsp`
 sudo ovs-ofctl --strict del-flows $sw priority=0
-sudo ovs-ofctl add-flow $sw "priority=1000,nsi=255 actions=move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],set_nsi:254,IN_PORT" -OOpenFlow13
-sudo ovs-ofctl add-flow $sw "priority=1000,nsi=254 actions=move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],set_nsi:253,IN_PORT" -OOpenFlow13
+sudo ovs-ofctl add-flow $sw "priority=1000,nsi=255 actions=move:NXM_NX_NSH_MDTYPE[]->NXM_NX_NSH_MDTYPE[],move:NXM_NX_NSH_NP[]->NXM_NX_NSH_NP[],move:NXM_NX_NSP[]->NXM_NX_NSP[],load:254->NXM_NX_NSI[],move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],load:0x4->NXM_NX_TUN_GPE_NP[],IN_PORT" -OOpenFlow13
+sudo ovs-ofctl add-flow $sw "priority=1000,nsi=254 actions=move:NXM_NX_NSH_MDTYPE[]->NXM_NX_NSH_MDTYPE[],move:NXM_NX_NSH_NP[]->NXM_NX_NSH_NP[],move:NXM_NX_NSP[]->NXM_NX_NSP[],load:253->NXM_NX_NSI[],move:NXM_NX_NSH_C1[]->NXM_NX_NSH_C1[],move:NXM_NX_NSH_C2[]->NXM_NX_NSH_C2[],move:NXM_NX_TUN_ID[0..31]->NXM_NX_TUN_ID[0..31],load:$TUNNEL->NXM_NX_TUN_IPV4_DST[],load:0x4->NXM_NX_TUN_GPE_NP[],IN_PORT" -OOpenFlow13

diff --git a/demos/gbpsfc-env/demo-symmetric-coexistence/infrastructure_config.py b/demos/gbpsfc-env/demo-symmetric-coexistence/infrastructure_config.py
index bdeb050a490b5672f11855aaac3bfd86e14d37a8..32475835fb0c1ccc20223a40579b740478029a9b 100755 (executable)
--- a/demos/gbpsfc-env/demo-symmetric-coexistence/infrastructure_config.py
+++ b/demos/gbpsfc-env/demo-symmetric-coexistence/infrastructure_config.py
@@ -24,27 +24,27 @@ defaultContainerImage='alagalah/odlpoc_ovs230'
 
 #Note that tenant name and endpointGroup name come from policy_config.py
 
-hosts = [{'name': 'h35_2',
+hosts = [{'name': 'h35-2',
           'mac': '00:00:00:00:35:02',
           'ip': '10.0.35.2/24',
           'switch': 'sw1'},
-         {'name': 'h35_3',
+         {'name': 'h35-3',
           'ip': '10.0.35.3/24',
           'mac': '00:00:00:00:35:03',
           'switch': 'sw2'},
-         {'name': 'h35_4',
+         {'name': 'h35-4',
           'ip': '10.0.35.4/24',
           'mac': '00:00:00:00:35:04',
           'switch': 'sw4'},
-         {'name': 'h36_2',
+         {'name': 'h36-2',
           'ip': '10.0.36.2/24',
           'mac': '00:00:00:00:36:02',
           'switch': 'sw1'},
-         {'name': 'h36_3',
+         {'name': 'h36-3',
           'ip': '10.0.36.3/24',
           'mac': '00:00:00:00:36:03',
           'switch': 'sw2'},
-         {'name': 'h36_4',
+         {'name': 'h36-4',
           'ip': '10.0.36.4/24',
           'mac': '00:00:00:00:36:04',
           'switch': 'sw4'}

diff --git a/demos/gbpsfc-env/demo-symmetric-coexistence/rest.py b/demos/gbpsfc-env/demo-symmetric-coexistence/rest.py
index 2884d76a0e900d9a52638f44215347220c9c3e99..f92d9fd91288a4506e2518d30a7976d5774f11b8 100755 (executable)
--- a/demos/gbpsfc-env/demo-symmetric-coexistence/rest.py
+++ b/demos/gbpsfc-env/demo-symmetric-coexistence/rest.py
@@ -535,7 +535,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_2",
+    "port-name": "vethl-h36-2",
     "tenant": "tenant-red"
 }
 },
@@ -551,7 +551,7 @@ def get_endpoint_data():
         "l3-context": "l3-context-vrf-red"
     }
 ],
-"port-name": "vethl-h35_2",
+"port-name": "vethl-h35-2",
 "tenant": "tenant-red"
 }
 },
@@ -571,7 +571,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_3",
+    "port-name": "vethl-h35-3",
     "tenant": "tenant-red"
 }
 },
@@ -591,7 +591,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_3",
+    "port-name": "vethl-h36-3",
     "tenant": "tenant-red"
 }
 },
@@ -611,7 +611,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_4",
+    "port-name": "vethl-h36-4",
     "tenant": "tenant-red"
 }
 },
@@ -631,7 +631,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_4",
+    "port-name": "vethl-h35-4",
     "tenant": "tenant-red"
 }
 },
@@ -651,7 +651,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h35_5",
+    "port-name": "vethl-h35-5",
     "tenant": "tenant-red"
 }
 },
@@ -671,7 +671,7 @@ def get_endpoint_data():
             "l3-context": "l3-context-vrf-red"
         }
     ],
-    "port-name": "vethl-h36_5",
+    "port-name": "vethl-h36-5",
     "tenant": "tenant-red"
 }
 }]

diff --git a/demos/gbpsfc-env/infrastructure_launch.py b/demos/gbpsfc-env/infrastructure_launch.py
index 5653063c93bfe0f2623afb4a610eb65bcccef117..76efb0dc0cf79c3d2fc2db36d86a70901a7f1bcd 100755 (executable)
--- a/demos/gbpsfc-env/infrastructure_launch.py
+++ b/demos/gbpsfc-env/infrastructure_launch.py
@@ -52,6 +52,7 @@ def addGpeTunnel(sw, sourceIp=None):
     cmd = ['ovs-vsctl', 'add-port', sw, ifaceName,
            '--', 'set', 'Interface', ifaceName,
            'type=vxlan',
+           'options:exts=gpe',
            'options:remote_ip=flow',
            'options:dst_port=6633',
            'options:nshc1=flow',