From c564637d0c58d95e29f575c863c64865f9138c62 Mon Sep 17 00:00:00 2001
From: tianran zhou <zhoutianran@huawei.com>
Date: Wed, 13 Jan 2016 11:58:52 +0800
Subject: [PATCH] Modify resource files and add template resource files.

Change-Id: I958137848e0b2ab6a6a37799a8f08261d278c07b
Signed-off-by: tianran zhou <zhoutianran@huawei.com>
---
 .../karaf/external-resource-template.json     |  24 +++
 .../opendaylight/karaf/external-resource.json |  24 +--
 .../karaf/host-resource-template.json         |  24 +++
 .../etc/opendaylight/karaf/host-resource.json |  26 ++-
 .../karaf/link-resource-template.json         |  42 +++++
 .../karaf/node-resource-template.json         | 172 ++++++++++++++++++
 .../etc/opendaylight/karaf/node-resource.json |   2 +-
 7 files changed, 288 insertions(+), 26 deletions(-)
 create mode 100644 nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-template.json
 create mode 100644 nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource-template.json
 create mode 100644 nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/link-resource-template.json
 create mode 100644 nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/node-resource-template.json

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
index 0000000..06b0d85
--- /dev/null
+++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/external-resource-template.json
@@ -0,0 +1,24 @@
+{
+    "external-network-mac": [
+        {
+          "node-id":"openflow:3",
+          "port-id":"openflow:3:4",
+          "mac-address":"00:00:00:00:00:02"
+        },
+        {
+          "node-id":"openflow:4",
+          "port-id":"openflow:4:2",
+          "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"
+        }
+    ]
+}
\ 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 65c72e4..dd864b6 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,32 +3,12 @@
         {
           "node-id":"openflow:3",
           "port-id":"openflow:3:4",
-          "mac-address":"00:00:00:00:00:02"
+          "mac-address":"00:00:00:00:00:06"
         },
         {
           "node-id":"openflow:4",
           "port-id":"openflow:4:2",
-          "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"
+          "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/host-resource-template.json b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource-template.json
new file mode 100644
index 0000000..bfcd19a
--- /dev/null
+++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/host-resource-template.json
@@ -0,0 +1,24 @@
+{
+    "host":[
+        {
+          "name":"vm2",
+          "id":"6c787caa-156a-49ed-8546-547bdccf283c",
+          "ip-addresses":[
+            {"ip-address":"192.168.12.3"}
+          ],
+          "mac-address":"00:00:00:00:00:05",
+          "node-id":"openflow:2",
+          "connector-id":"openflow:2:1"
+        },
+        {
+          "name":"server1",
+          "id":"22282cca-9a13-4d0c-a67e-a933ebb0b0ae",
+          "ip-addresses":[
+            {"ip-address":"192.168.12.2"}
+          ],
+          "mac-address":"00:00:00:00:00:04",
+          "node-id":"openflow:2",
+          "connector-id":"openflow:2:2"
+        }
+      ]
+}
\ 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 bfcd19a..d3f4257 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,20 +1,40 @@
 {
     "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:01",
+          "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:02",
+          "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:05",
+          "mac-address":"00:00:00:00:00:03",
           "node-id":"openflow:2",
           "connector-id":"openflow:2:1"
         },
         {
-          "name":"server1",
+          "name":"video-server2",
           "id":"22282cca-9a13-4d0c-a67e-a933ebb0b0ae",
           "ip-addresses":[
-            {"ip-address":"192.168.12.2"}
+            {"ip-address":"192.168.12.4"}
           ],
           "mac-address":"00:00:00:00:00:04",
           "node-id":"openflow:2",
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
index 0000000..ac508b4
--- /dev/null
+++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/link-resource-template.json
@@ -0,0 +1,42 @@
+{
+    "link": [
+        {
+          "link-id":"openflow:1:3",
+          "metric":"1",
+          "delay":"",
+          "loss-rate":""
+        },
+        {
+          "link-id":"openflow:3:1",
+          "metric":"1",
+          "delay":"",
+          "loss-rate":""
+        },
+
+        {
+          "link-id":"openflow:3:2",
+          "metric":"1",
+          "delay":"",
+          "loss-rate":""
+        },
+        {
+          "link-id":"openflow:2:3",
+          "metric":"1",
+          "delay":"",
+          "loss-rate":""
+        },
+
+        {
+          "link-id":"openflow:3:3",
+          "metric":"1",
+          "delay":"",
+          "loss-rate":""
+        },
+        {
+          "link-id":"openflow:4:1",
+          "metric":"1",
+          "delay":"",
+          "loss-rate":""
+        }
+    ]
+}
\ 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
index 0000000..3f5eb9c
--- /dev/null
+++ b/nemo-renderers/openflow-renderer/src/main/resources/etc/opendaylight/karaf/node-resource-template.json
@@ -0,0 +1,172 @@
+{
+  "node": [
+    {
+      "node-id": "openflow:1",
+      "node-type": "router",
+      "attribute": [
+        {
+          "name": "location",
+          "value": "openflow:1"
+        }
+      ],
+      "port": [
+        {
+          "port-id": "openflow:1:1",
+          "port-type": "external",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:1:1"
+            }
+          ]
+        },
+        {
+          "port-id": "openflow:1:2",
+          "port-type": "external",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:1:2"
+            }
+          ]
+        },
+        {
+          "port-id": "openflow:1:3",
+          "port-type": "internal",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:1:3"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "node-id": "openflow:2",
+      "node-type": "switch",
+      "attribute": [
+        {
+          "name": "location",
+          "value": "openflow:2"
+        }
+      ],
+      "port": [
+        {
+          "port-id": "openflow:2:1",
+          "port-type": "external",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:2:1"
+            }
+          ]
+        },
+        {
+          "port-id": "openflow:2:2",
+          "port-type": "external",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:2:2"
+            }
+          ]
+        },
+        {
+          "port-id": "openflow:2:3",
+          "port-type": "internal",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:2:3"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "node-id": "openflow:3",
+      "node-type": "router",
+      "attribute": [
+        {
+          "name": "location",
+          "value": "openflow:3"
+        }
+      ],
+      "port": [
+        {
+          "port-id": "openflow:3:1",
+          "port-type": "internal",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:3:1"
+            }
+          ]
+        },
+        {
+          "port-id": "openflow:3:2",
+          "port-type": "internal",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:3:2"
+            }
+          ]
+        },
+        {
+          "port-id": "openflow:3:3",
+          "port-type": "internal",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:3:3"
+            }
+          ]
+        },
+        {
+          "port-id": "openflow:3:4",
+          "port-type": "external",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:3:4"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "node-id": "openflow:4",
+      "node-type": "router",
+      "attribute": [
+        {
+          "name": "location",
+          "value": "openflow:4"
+        }
+      ],
+      "port": [
+        {
+          "port-id": "openflow:4:1",
+          "port-type": "internal",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:4:1"
+            }
+          ]
+        },
+        {
+          "port-id": "openflow:4:2",
+          "port-type": "external",
+          "attribute": [
+            {
+              "name": "location",
+              "value": "openflow:4:2"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ 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 3f5eb9c..420940e 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": "router",
+      "node-type": "switch",
       "attribute": [
         {
           "name": "location",
-- 
2.36.6