Modify resource files and add template resource files.

Change-Id: I958137848e0b2ab6a6a37799a8f08261d278c07b
Signed-off-by: tianran zhou <zhoutianran@huawei.com>

diff --git a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-template.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-template.json
new file mode 100644 (file)
index 0000000..06b0d85
--- /dev/null
+++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-template.json
@@ -0,0 +1,24 @@
+{\r
+    "external-network-mac": [\r
+        {\r
+          "node-id":"openflow:3",\r
+          "port-id":"openflow:3:4",\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":"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
+}
\ 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 65c72e4ebcfbe09ee853dfd3048937e1ff701fa8..dd864b6aecc2eb82e31bc98a56c9cffdf1380180 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,32 +3,12 @@
         {\r
           "node-id":"openflow:3",\r
           "port-id":"openflow:3:4",\r
-          "mac-address":"00:00:00:00:00:02"\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":"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
+          "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/host-resource-template.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource-template.json
new file mode 100644 (file)
index 0000000..bfcd19a
--- /dev/null
+++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource-template.json
@@ -0,0 +1,24 @@
+{\r
+    "host":[\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:05",\r
+          "node-id":"openflow:2",\r
+          "connector-id":"openflow:2:1"\r
+        },\r
+        {\r
+          "name":"server1",\r
+          "id":"22282cca-9a13-4d0c-a67e-a933ebb0b0ae",\r
+          "ip-addresses":[\r
+            {"ip-address":"192.168.12.2"}\r
+          ],\r
+          "mac-address":"00:00:00:00:00:04",\r
+          "node-id":"openflow:2",\r
+          "connector-id":"openflow:2:2"\r
+        }\r
+      ]\r
+}
\ No newline at end of file

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 bfcd19a1b2a5364e17aa2f29d2e5314be737bc7c..d3f4257b3dd1f5eea9fc9c4bc72e9e54c8c9d88b 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,20 +1,40 @@
 {\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:01",\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:02",\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:05",\r
+          "mac-address":"00:00:00:00:00:03",\r
           "node-id":"openflow:2",\r
           "connector-id":"openflow:2:1"\r
         },\r
         {\r
-          "name":"server1",\r
+          "name":"video-server2",\r
           "id":"22282cca-9a13-4d0c-a67e-a933ebb0b0ae",\r
           "ip-addresses":[\r
-            {"ip-address":"192.168.12.2"}\r
+            {"ip-address":"192.168.12.4"}\r
           ],\r
           "mac-address":"00:00:00:00:00:04",\r
           "node-id":"openflow:2",\r

diff --git a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/link-resource-template.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/link-resource-template.json
new file mode 100644 (file)
index 0000000..ac508b4
--- /dev/null
+++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/link-resource-template.json
@@ -0,0 +1,42 @@
+{\r
+    "link": [\r
+        {\r
+          "link-id":"openflow:1:3",\r
+          "metric":"1",\r
+          "delay":"",\r
+          "loss-rate":""\r
+        },\r
+        {\r
+          "link-id":"openflow:3:1",\r
+          "metric":"1",\r
+          "delay":"",\r
+          "loss-rate":""\r
+        },\r
+\r
+        {\r
+          "link-id":"openflow:3:2",\r
+          "metric":"1",\r
+          "delay":"",\r
+          "loss-rate":""\r
+        },\r
+        {\r
+          "link-id":"openflow:2:3",\r
+          "metric":"1",\r
+          "delay":"",\r
+          "loss-rate":""\r
+        },\r
+\r
+        {\r
+          "link-id":"openflow:3:3",\r
+          "metric":"1",\r
+          "delay":"",\r
+          "loss-rate":""\r
+        },\r
+        {\r
+          "link-id":"openflow:4:1",\r
+          "metric":"1",\r
+          "delay":"",\r
+          "loss-rate":""\r
+        }\r
+    ]\r
+}
\ No newline at end of file

diff --git a/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/node-resource-template.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/node-resource-template.json
new file mode 100644 (file)
index 0000000..3f5eb9c
--- /dev/null
+++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/node-resource-template.json
@@ -0,0 +1,172 @@
+{\r
+  "node": [\r
+    {\r
+      "node-id": "openflow:1",\r
+      "node-type": "router",\r
+      "attribute": [\r
+        {\r
+          "name": "location",\r
+          "value": "openflow:1"\r
+        }\r
+      ],\r
+      "port": [\r
+        {\r
+          "port-id": "openflow:1:1",\r
+          "port-type": "external",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:1:1"\r
+            }\r
+          ]\r
+        },\r
+        {\r
+          "port-id": "openflow:1:2",\r
+          "port-type": "external",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:1:2"\r
+            }\r
+          ]\r
+        },\r
+        {\r
+          "port-id": "openflow:1:3",\r
+          "port-type": "internal",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:1:3"\r
+            }\r
+          ]\r
+        }\r
+      ]\r
+    },\r
+    {\r
+      "node-id": "openflow:2",\r
+      "node-type": "switch",\r
+      "attribute": [\r
+        {\r
+          "name": "location",\r
+          "value": "openflow:2"\r
+        }\r
+      ],\r
+      "port": [\r
+        {\r
+          "port-id": "openflow:2:1",\r
+          "port-type": "external",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:2:1"\r
+            }\r
+          ]\r
+        },\r
+        {\r
+          "port-id": "openflow:2:2",\r
+          "port-type": "external",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:2:2"\r
+            }\r
+          ]\r
+        },\r
+        {\r
+          "port-id": "openflow:2:3",\r
+          "port-type": "internal",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:2:3"\r
+            }\r
+          ]\r
+        }\r
+      ]\r
+    },\r
+    {\r
+      "node-id": "openflow:3",\r
+      "node-type": "router",\r
+      "attribute": [\r
+        {\r
+          "name": "location",\r
+          "value": "openflow:3"\r
+        }\r
+      ],\r
+      "port": [\r
+        {\r
+          "port-id": "openflow:3:1",\r
+          "port-type": "internal",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:3:1"\r
+            }\r
+          ]\r
+        },\r
+        {\r
+          "port-id": "openflow:3:2",\r
+          "port-type": "internal",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:3:2"\r
+            }\r
+          ]\r
+        },\r
+        {\r
+          "port-id": "openflow:3:3",\r
+          "port-type": "internal",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:3:3"\r
+            }\r
+          ]\r
+        },\r
+        {\r
+          "port-id": "openflow:3:4",\r
+          "port-type": "external",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:3:4"\r
+            }\r
+          ]\r
+        }\r
+      ]\r
+    },\r
+    {\r
+      "node-id": "openflow:4",\r
+      "node-type": "router",\r
+      "attribute": [\r
+        {\r
+          "name": "location",\r
+          "value": "openflow:4"\r
+        }\r
+      ],\r
+      "port": [\r
+        {\r
+          "port-id": "openflow:4:1",\r
+          "port-type": "internal",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:4:1"\r
+            }\r
+          ]\r
+        },\r
+        {\r
+          "port-id": "openflow:4:2",\r
+          "port-type": "external",\r
+          "attribute": [\r
+            {\r
+              "name": "location",\r
+              "value": "openflow:4:2"\r
+            }\r
+          ]\r
+        }\r
+      ]\r
+    }\r
+  ]\r
+}
\ No newline at end of file

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