CORD-2650 adding more functional tests to dataplane test and using control plane datafile
Change-Id: If2638486e54773017812079f38fd868663d328c3
diff --git a/src/test/setup/calix_fabric_test_netcfg.json b/src/test/setup/calix_fabric_test_netcfg.json
new file mode 100644
index 0000000..de4defd
--- /dev/null
+++ b/src/test/setup/calix_fabric_test_netcfg.json
@@ -0,0 +1,92 @@
+{
+ "devices": {
+ "of:0000480fcfae6e0a": {
+ "segmentrouting": {
+ "name": "device-480fcfae6e0a",
+ "ipv4NodeSid": 100,
+ "ipv4Loopback": "10.6.0.102",
+ "routerMac": "48:0f:cf:ae:6e:0a",
+ "isEdgeRouter": false,
+ "adjacencySids": []
+ }
+ },
+ "of:0000480fcfaedea8": {
+ "segmentrouting": {
+ "name": "device-480fcfaedea8",
+ "ipv4NodeSid": 101,
+ "ipv4Loopback": "10.6.0.104",
+ "routerMac": "48:0f:cf:ae:de:a8",
+ "isEdgeRouter": true,
+ "adjacencySids": []
+ }
+ },
+ "of:0000480fcfae8e12": {
+ "segmentrouting": {
+ "name": "device-480fcfae8e12",
+ "ipv4NodeSid": 102,
+ "ipv4Loopback": "10.6.0.101",
+ "routerMac": "48:0f:cf:ae:8e:12",
+ "isEdgeRouter": false,
+ "adjacencySids": []
+ }
+ },
+ "of:0000480fcfaeeeac": {
+ "segmentrouting": {
+ "name": "device-480fcfaeeeac",
+ "ipv4NodeSid": 103,
+ "ipv4Loopback": "10.6.0.103",
+ "routerMac": "48:0f:cf:ae:ee:ac",
+ "isEdgeRouter": true,
+ "adjacencySids": []
+ }
+ }
+ },
+ "ports": {
+ "of:0000480fcfaedea8/2": {
+ "interfaces": [
+ {
+ "ips": [ "10.6.2.254/24" ],
+ "vlan-untagged" : 2
+ }
+ ]
+ },
+ "of:0000480fcfaedea8/1": {
+ "interfaces": [
+ {
+ "ips": [ "10.6.2.254/24" ],
+ "vlan-untagged" : 2
+ }
+ ]
+ },
+ "of:0000480fcfaeeeac/1": {
+ "interfaces": [
+ {
+ "ips": [ "10.6.1.254/24" ],
+ "vlan-untagged" : 1
+ }
+ ]
+ }
+ },
+ "apps" : {
+ "org.onosproject.segmentrouting" : {
+ "segmentrouting" : {
+ "vRouterMacs" : [ "a4:23:05:06:01:01" ]
+ },
+ "xconnect": {
+ "of:0000480fcfaedea8": [{
+ "vlan": 333,
+ "ports": [1, 2],
+ "name": "vsg-1"
+ },
+ {
+ "vlan": 555,
+ "ports": [1, 2],
+ "name": "vsg-2"},
+ {
+ "vlan": 666,
+ "ports": [1, 2],
+ "name": "vsg-3"}]
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 4838e49..e7f3f3a 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -1397,7 +1397,7 @@
if args.onos_cord:
#try restoring the onos cord instance
try:
- onos_cord = OnosCord(args.onos_ip, args.onos_cord, args.service_profile, args.synchronizer, start = False, skip = test_manifest.skip_onos_restart)
+ onos_cord = OnosCord(args.onos_ip, args.onos_cord, args.service_profile, args.synchronizer, start = False, skip = manifest.skip_onos_restart)
onos_cord.restore(force = True)
except Exception as e:
print(e)