From 11824236d24a619d317dbcdf20a7406cb6a54f5d Mon Sep 17 00:00:00 2001 From: Zhigang Ji Date: Sat, 26 Dec 2015 15:50:30 +0800 Subject: [PATCH] Add 4 resource files for nemo template scenario in openflow-renderer. Modify resource files for nemo bod and sfc scenario in openflow-renderer. Change-Id: I0f6f40c9bade8129eca1f1ef0caacc4a7eda53e5 Signed-off-by: Zhigang Ji --- .../karaf/external-resource-bod.json | 4 +-- .../karaf/external-resource-servicechain.json | 10 +++---- .../opendaylight/karaf/external-resource.json | 24 ++++++++++++++-- .../opendaylight/karaf/host-resource-bod.json | 8 +++--- .../etc/opendaylight/karaf/host-resource.json | 28 +++---------------- .../etc/opendaylight/karaf/node-resource.json | 2 +- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-bod.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-bod.json index 1ded4ed..dd864b6 100644 --- a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-bod.json +++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-bod.json @@ -3,12 +3,12 @@ { "node-id":"openflow:3", "port-id":"openflow:3:4", - "mac-address":"08:00:27:40:9c:10" + "mac-address":"00:00:00:00:00:06" }, { "node-id":"openflow:4", "port-id":"openflow:4:2", - "mac-address":"08:00:27:0d:ef:79" + "mac-address":"00:00:00:00:00:05" } ] } \ No newline at end of file diff --git a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-servicechain.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-servicechain.json index 15f6845..f1be3ce 100644 --- a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-servicechain.json +++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-servicechain.json @@ -3,7 +3,7 @@ { "node-id":"openflow:3", "port-id":"openflow:3:4", - "mac-address":"08:00:27:6e:f2:07" + "mac-address":"00:00:00:00:00:04" }, { "node-id":"openflow:4", @@ -13,22 +13,22 @@ { "node-id":"openflow:1", "port-id":"openflow:1:1", - "mac-address":"08:00:27:65:4c:f6" + "mac-address":"00:00:00:00:00:01" }, { "node-id":"openflow:1", "port-id":"openflow:1:2", - "mac-address":"00:00:00:00:00:01" + "mac-address":"00:00:00:00:00:05" }, { "node-id":"openflow:2", "port-id":"openflow:2:1", - "mac-address":"00:00:00:00:00:02" + "mac-address":"00:00:00:00:00:06" }, { "node-id":"openflow:2", "port-id":"openflow:2:2", - "mac-address":"08:00:27:90:0f:a5" + "mac-address":"00:00:00:00:00:02" } ] } \ No newline at end of file diff --git a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource.json index 1ded4ed..65c72e4 100644 --- a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource.json +++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource.json @@ -3,12 +3,32 @@ { "node-id":"openflow:3", "port-id":"openflow:3:4", - "mac-address":"08:00:27:40:9c:10" + "mac-address":"00:00:00:00:00:02" }, { "node-id":"openflow:4", "port-id":"openflow:4:2", - "mac-address":"08:00:27:0d:ef:79" + "mac-address":"00:00:00:00:00:03" + }, + { + "node-id":"openflow:1", + "port-id":"openflow:1:1", + "mac-address":"00:00:00:00:00:01" + }, + { + "node-id":"openflow:1", + "port-id":"openflow:1:2", + "mac-address":"00:00:00:01:01:01" + }, + { + "node-id":"openflow:2", + "port-id":"openflow:2:1", + "mac-address":"00:00:00:02:02:02" + }, + { + "node-id":"openflow:2", + "port-id":"openflow:2:2", + "mac-address":"00:00:00:00:00:04" } ] } \ No newline at end of file diff --git a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource-bod.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource-bod.json index 9a4c407..d3f4257 100644 --- a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource-bod.json +++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource-bod.json @@ -6,7 +6,7 @@ "ip-addresses":[ {"ip-address":"192.168.11.2"} ], - "mac-address":"00:00:00:00:00:03", + "mac-address":"00:00:00:00:00:01", "node-id":"openflow:1", "connector-id":"openflow:1:1" }, @@ -16,7 +16,7 @@ "ip-addresses":[ {"ip-address":"192.168.12.2"} ], - "mac-address":"00:00:00:00:00:01", + "mac-address":"00:00:00:00:00:02", "node-id":"openflow:1", "connector-id":"openflow:1:2" }, @@ -26,7 +26,7 @@ "ip-addresses":[ {"ip-address":"192.168.12.3"} ], - "mac-address":"00:00:00:00:00:02", + "mac-address":"00:00:00:00:00:03", "node-id":"openflow:2", "connector-id":"openflow:2:1" }, @@ -36,7 +36,7 @@ "ip-addresses":[ {"ip-address":"192.168.12.4"} ], - "mac-address":"08:00:27:a0:a9:b3", + "mac-address":"00:00:00:00:00:04", "node-id":"openflow:2", "connector-id":"openflow:2:2" } diff --git a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource.json index 9a4c407..bfcd19a 100644 --- a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource.json +++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource.json @@ -1,42 +1,22 @@ { "host":[ - { - "name":"video-server1", - "id":"7b796915-adf4-4356-b5ca-de005ac410c1", - "ip-addresses":[ - {"ip-address":"192.168.11.2"} - ], - "mac-address":"00:00:00:00:00:03", - "node-id":"openflow:1", - "connector-id":"openflow:1:1" - }, - { - "name":"vm1", - "id":"1eaf9a67-a171-42a8-9282-71cf702f61dd", - "ip-addresses":[ - {"ip-address":"192.168.12.2"} - ], - "mac-address":"00:00:00:00:00:01", - "node-id":"openflow:1", - "connector-id":"openflow:1:2" - }, { "name":"vm2", "id":"6c787caa-156a-49ed-8546-547bdccf283c", "ip-addresses":[ {"ip-address":"192.168.12.3"} ], - "mac-address":"00:00:00:00:00:02", + "mac-address":"00:00:00:00:00:05", "node-id":"openflow:2", "connector-id":"openflow:2:1" }, { - "name":"video-server2", + "name":"server1", "id":"22282cca-9a13-4d0c-a67e-a933ebb0b0ae", "ip-addresses":[ - {"ip-address":"192.168.12.4"} + {"ip-address":"192.168.12.2"} ], - "mac-address":"08:00:27:a0:a9:b3", + "mac-address":"00:00:00:00:00:04", "node-id":"openflow:2", "connector-id":"openflow:2:2" } diff --git a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/node-resource.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/node-resource.json index 420940e..3f5eb9c 100644 --- a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/node-resource.json +++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/node-resource.json @@ -2,7 +2,7 @@ "node": [ { "node-id": "openflow:1", - "node-type": "switch", + "node-type": "router", "attribute": [ { "name": "location", -- 2.36.6