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 <jizhigang@huawei.com>

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 1ded4edb5fab2f4bea306bfdfb942a83e1e4a56e..dd864b6aecc2eb82e31bc98a56c9cffdf1380180 100644 (file)
--- 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 @@
         {\r
           "node-id":"openflow:3",\r
           "port-id":"openflow:3:4",\r
-          "mac-address":"08:00:27:40:9c:10"\r
+          "mac-address":"00:00:00:00:00:06"\r
         },\r
         {\r
           "node-id":"openflow:4",\r
           "port-id":"openflow:4:2",\r
-          "mac-address":"08:00:27:0d:ef:79"\r
+          "mac-address":"00:00:00:00:00:05"\r
         }\r
     ]\r
 }
\ 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 15f6845778596c6b761622308333ef13ca61e083..f1be3ceb1487f5afd887e1d8674881a9fedd9281 100644 (file)
--- 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 @@
         {\r
           "node-id":"openflow:3",\r
           "port-id":"openflow:3:4",\r
-          "mac-address":"08:00:27:6e:f2:07"\r
+          "mac-address":"00:00:00:00:00:04"\r
         },\r
         {\r
           "node-id":"openflow:4",\r
@@ -13,22 +13,22 @@
         {\r
           "node-id":"openflow:1",\r
           "port-id":"openflow:1:1",\r
-          "mac-address":"08:00:27:65:4c:f6"\r
+          "mac-address":"00:00:00:00:00:01"\r
         },\r
         {\r
           "node-id":"openflow:1",\r
           "port-id":"openflow:1:2",\r
-          "mac-address":"00:00:00:00:00:01"\r
+          "mac-address":"00:00:00:00:00:05"\r
         },\r
         {\r
           "node-id":"openflow:2",\r
           "port-id":"openflow:2:1",\r
-          "mac-address":"00:00:00:00:00:02"\r
+          "mac-address":"00:00:00:00:00:06"\r
         },\r
         {\r
           "node-id":"openflow:2",\r
           "port-id":"openflow:2:2",\r
-          "mac-address":"08:00:27:90:0f:a5"\r
+          "mac-address":"00:00:00:00:00:02"\r
         }\r
     ]\r
 }
\ 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 1ded4edb5fab2f4bea306bfdfb942a83e1e4a56e..65c72e4ebcfbe09ee853dfd3048937e1ff701fa8 100644 (file)
--- 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 @@
         {\r
           "node-id":"openflow:3",\r
           "port-id":"openflow:3:4",\r
-          "mac-address":"08:00:27:40:9c:10"\r
+          "mac-address":"00:00:00:00:00:02"\r
         },\r
         {\r
           "node-id":"openflow:4",\r
           "port-id":"openflow:4:2",\r
-          "mac-address":"08:00:27:0d:ef:79"\r
+          "mac-address":"00:00:00:00:00:03"\r
+        },\r
+        {\r
+          "node-id":"openflow:1",\r
+          "port-id":"openflow:1:1",\r
+          "mac-address":"00:00:00:00:00:01"\r
+        },\r
+        {\r
+          "node-id":"openflow:1",\r
+          "port-id":"openflow:1:2",\r
+          "mac-address":"00:00:00:01:01:01"\r
+        },\r
+        {\r
+          "node-id":"openflow:2",\r
+          "port-id":"openflow:2:1",\r
+          "mac-address":"00:00:00:02:02:02"\r
+        },\r
+        {\r
+          "node-id":"openflow:2",\r
+          "port-id":"openflow:2:2",\r
+          "mac-address":"00:00:00:00:00:04"\r
         }\r
     ]\r
 }
\ 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 9a4c407493b5a21ca3181c65d040844c9c5e89c8..d3f4257b3dd1f5eea9fc9c4bc72e9e54c8c9d88b 100644 (file)
--- 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":[\r
             {"ip-address":"192.168.11.2"}\r
           ],\r
-          "mac-address":"00:00:00:00:00:03",\r
+          "mac-address":"00:00:00:00:00:01",\r
           "node-id":"openflow:1",\r
           "connector-id":"openflow:1:1"\r
         },\r
@@ -16,7 +16,7 @@
           "ip-addresses":[\r
             {"ip-address":"192.168.12.2"}\r
           ],\r
-          "mac-address":"00:00:00:00:00:01",\r
+          "mac-address":"00:00:00:00:00:02",\r
           "node-id":"openflow:1",\r
           "connector-id":"openflow:1:2"\r
         },\r
@@ -26,7 +26,7 @@
           "ip-addresses":[\r
             {"ip-address":"192.168.12.3"}\r
           ],\r
-          "mac-address":"00:00:00:00:00:02",\r
+          "mac-address":"00:00:00:00:00:03",\r
           "node-id":"openflow:2",\r
           "connector-id":"openflow:2:1"\r
         },\r
@@ -36,7 +36,7 @@
           "ip-addresses":[\r
             {"ip-address":"192.168.12.4"}\r
           ],\r
-          "mac-address":"08:00:27:a0:a9:b3",\r
+          "mac-address":"00:00:00:00:00:04",\r
           "node-id":"openflow:2",\r
           "connector-id":"openflow:2:2"\r
         }\r

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 9a4c407493b5a21ca3181c65d040844c9c5e89c8..bfcd19a1b2a5364e17aa2f29d2e5314be737bc7c 100644 (file)
--- 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 @@
 {\r
     "host":[\r
-        {\r
-          "name":"video-server1",\r
-          "id":"7b796915-adf4-4356-b5ca-de005ac410c1",\r
-          "ip-addresses":[\r
-            {"ip-address":"192.168.11.2"}\r
-          ],\r
-          "mac-address":"00:00:00:00:00:03",\r
-          "node-id":"openflow:1",\r
-          "connector-id":"openflow:1:1"\r
-        },\r
-        {\r
-          "name":"vm1",\r
-          "id":"1eaf9a67-a171-42a8-9282-71cf702f61dd",\r
-          "ip-addresses":[\r
-            {"ip-address":"192.168.12.2"}\r
-          ],\r
-          "mac-address":"00:00:00:00:00:01",\r
-          "node-id":"openflow:1",\r
-          "connector-id":"openflow:1:2"\r
-        },\r
         {\r
           "name":"vm2",\r
           "id":"6c787caa-156a-49ed-8546-547bdccf283c",\r
           "ip-addresses":[\r
             {"ip-address":"192.168.12.3"}\r
           ],\r
-          "mac-address":"00:00:00:00:00:02",\r
+          "mac-address":"00:00:00:00:00:05",\r
           "node-id":"openflow:2",\r
           "connector-id":"openflow:2:1"\r
         },\r
         {\r
-          "name":"video-server2",\r
+          "name":"server1",\r
           "id":"22282cca-9a13-4d0c-a67e-a933ebb0b0ae",\r
           "ip-addresses":[\r
-            {"ip-address":"192.168.12.4"}\r
+            {"ip-address":"192.168.12.2"}\r
           ],\r
-          "mac-address":"08:00:27:a0:a9:b3",\r
+          "mac-address":"00:00:00:00:00:04",\r
           "node-id":"openflow:2",\r
           "connector-id":"openflow:2:2"\r
         }\r

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 420940e00b2727471ffb4a823e936d2f84ff3d5c..3f5eb9c97839eefd3b7c20d43e5f463f7be461d6 100644 (file)
--- 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": [\r
     {\r
       "node-id": "openflow:1",\r
-      "node-type": "switch",\r
+      "node-type": "router",\r
       "attribute": [\r
         {\r
           "name": "location",\r