Fixed example network-cfg.json files for SONA applications
Change-Id: I49f30a22a5a9e7579ecb432b375ccaffd5bc71ce
diff --git a/apps/openstackinterface/network-cfg.json b/apps/openstackinterface/network-cfg.json
index c177e59..a78794e 100644
--- a/apps/openstackinterface/network-cfg.json
+++ b/apps/openstackinterface/network-cfg.json
@@ -4,26 +4,9 @@
"openstackinterface" : {
"neutron_server" : "http://10.40.101.209:9696/v2.0/",
"keystone_server" : "http://10.40.101.209:5000/v2.0/",
- "user_name" : "admin",
+ "user_name" : "admin",
"password" : "nova"
}
}
- },
- "devices" : {
- "of:0000000000000001" : {
- "basic" : {
- "driver" : "sona"
- }
- },
- "of:0000000000000002" : {
- "basic" : {
- "driver" : "sona"
- }
- },
- "of:0000000000000003" : {
- "basic" : {
- "driver" : "sona"
- }
- }
}
}
diff --git a/apps/openstacknetworking/network-cfg.json b/apps/openstacknetworking/network-cfg.json
deleted file mode 100644
index 6026478..0000000
--- a/apps/openstacknetworking/network-cfg.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "userDefined" : {
- "openstacknetworking" : {
- "config" : {
- "physicalRouterMac" : "86:1e:e1:b1:85:bd",
- "gatewayBridgeId" : "of:0000000000000003",
- "gatewayExternalInterfaceName" : "veth0",
- "gatewayExternalInterfaceMac" : "d2:b3:eb:36:bd:ae",
- "nodes" : [
- {
- "dataPlaneIp" : "10.40.101.208",
- "bridgeId" : "of:0000000000000001"
- },
- {
- "dataPlaneIp" : "10.40.101.227",
- "bridgeId" : "of:0000000000000002"
- },
- {
- "dataPlaneIp" : "10.40.101.240",
- "bridgeId" : "of:0000000000000003"
- }
- ]
- }
- }
- },
- "apps" : {
- "org.onosproject.openstackinterface" : {
- "openstackinterface" : {
- "neutronServer" : "http://10.40.101.209:9696/v2.0/",
- "keystoneServer" : "http://10.40.101.209:5000/v2.0/",
- "userName" : "admin",
- "password" : "nova"
- }
- }
- },
- "devices" : {
- "of:0000000000000001" : {
- "basic" : {
- "driver" : "sona"
- }
- },
- "of:0000000000000002" : {
- "basic" : {
- "driver" : "sona"
- }
- }
- }
-}
diff --git a/apps/openstacknode/network-cfg.json b/apps/openstacknode/network-cfg.json
index 47d7b80..4720104 100644
--- a/apps/openstacknode/network-cfg.json
+++ b/apps/openstacknode/network-cfg.json
@@ -23,7 +23,7 @@
"managementIp" : "10.203.198.125",
"dataIp" : "10.134.33.208",
"integrationBridge" : "of:00000000000000a3",
- "routerBridge" : "of:00000000000000b3"
+ "routerBridge" : "of:00000000000000b1"
},
{
"hostname" : "gateway-02",
@@ -31,11 +31,33 @@
"managementIp" : "10.203.198.131",
"dataIp" : "10.134.33.209",
"integrationBridge" : "of:00000000000000a4",
- "routerBridge" : "of:00000000000000b4"
+ "routerBridge" : "of:00000000000000b2"
}
]
}
}
+ },
+ "devices" : {
+ "of:00000000000000a1" : {
+ "basic" : {
+ "driver" : "sona"
+ }
+ },
+ "of:00000000000000a2" : {
+ "basic" : {
+ "driver" : "sona"
+ }
+ },
+ "of:00000000000000b1" : {
+ "basic" : {
+ "driver" : "softrouter"
+ }
+ },
+ "of:00000000000000b2" : {
+ "basic" : {
+ "driver" : "softrouter"
+ }
+ }
}
}