commit 8f7a72a329c4b15f0efabb0edacd18eebdec6a4a
author Andrea Campanella <andrea@opennetworking.org> Tue Mar 19 18:59:37 2019 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Tue Mar 19 18:59:37 2019 +0000
tree 96dfc6106efa7e63d45b204bd01219d1a0dd3efd
parent 458da6d3b47be5235cb1497dae40a32d204c6958
parent a85af8b692564cb762ace1ba240c4b69451db246

Merge "Fix for namespace ordering, path of cfg files, links"

cassini-demo/config-onos.sh

diff --git a/cassini-demo/config-onos.sh b/cassini-demo/config-onos.sh
index b77ef5d..db7299a 100755
--- a/cassini-demo/config-onos.sh
+++ b/cassini-demo/config-onos.sh
@@ -2,11 +2,11 @@
 onos localhost cfg set org.onosproject.netconf.ctl.impl.NetconfControllerImpl netconfReplyTimeout 20
 onos localhost cfg set org.onosproject.netconf.ctl.impl.NetconfControllerImpl netconfConnectTimeout 20
 onos localhost cfg set org.onosproject.netconf.ctl.impl.NetconfControllerImpl netconfIdleTimeout 30000 
-onos-netcfg localhost ~/openconfig-device-cassini-test1.json
+onos-netcfg localhost openconfig-device-cassini-test1.json
 sleep 10
-onos-netcfg localhost ~/openconfig-device-cassini-test2.json
+onos-netcfg localhost openconfig-device-cassini-test2.json
 sleep 10
-onos-netcfg localhost ~/openconfig-device-cassini-test-link.json
+onos-netcfg localhost openconfig-device-cassini-test-link.json
 sleep 2
 curl -X POST --user onos:rocks --header 'Content-Type: application/json' --header 'Accept: application/json' -d@h1.json http://10.172.0.2:8181/onos/v1/hosts
 sleep 2

cassini-demo/name-space.sh

diff --git a/cassini-demo/name-space.sh b/cassini-demo/name-space.sh
index 17ce523..4856bf2 100755
--- a/cassini-demo/name-space.sh
+++ b/cassini-demo/name-space.sh
@@ -8,6 +8,6 @@
 ip netns add $1
 ip link set dev $2 netns $1
 ip netns exec $1 ip link add link $2 name $2.$3 type vlan id $3
-ip netns exec $1 ifconfig $2.$3 $4
 ip netns exec $1 ifconfig $2 up
 ip netns exec $1 ifconfig $2.$3 up
+ip netns exec $1 ifconfig $2.$3 $4

cassini-demo/openconfig-device-cassini-test-link.json

diff --git a/cassini-demo/openconfig-device-cassini-test-link.json b/cassini-demo/openconfig-device-cassini-test-link.json
index 017b413..67fb641 100644
--- a/cassini-demo/openconfig-device-cassini-test-link.json
+++ b/cassini-demo/openconfig-device-cassini-test-link.json
@@ -1,6 +1,12 @@
 {
     "links": {
-        "netconf:10.172.0.11:830/101-netconf:10.172.0.12:830/101": {
+        "netconf:10.172.0.11:830/201-netconf:10.172.0.12:830/202": {
+            "basic" : {
+                "type": "OPTICAL",
+                "metric": 1
+            }
+        },
+        "netconf:10.172.0.11:830/202-netconf:10.172.0.12:830/201": {
             "basic" : {
                 "type": "OPTICAL",
                 "metric": 1