SDWAN WAN port DG addition

Updates include:
- Addition of sdwan port resource DG
- Templates

Change-Id: Id3913755e2724c26663269fb9c8235fc2ca7fb91
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 93bb206a1e4d8ce64a5f43d2733995a0a1b4fe92

4 files changed, 73 insertions, 19 deletions

diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-device-port-del.json b/platform-logic/restapi-templates/src/main/json/sdwan-device-port-del.json
new file mode 100644
index 00000000..243af571
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-device-port-del.json
@@ -0,0 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - CCSDK
+ * ================================================================================
+ * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+{
+    "ports": [
+        {
+            "id": ${prop.wan.devicePortId},            
+        }
+    ]
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-port.json b/platform-logic/restapi-templates/src/main/json/sdwan-port.json
index 61debbd8..b60a2715 100644
--- a/platform-logic/restapi-templates/src/main/json/sdwan-port.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-port.json
@@ -21,10 +21,10 @@
 {
     "ports": [
         {
-            "portType": ${prop.portType},
-            "portNumber": ${prop.portNumber},
-            "deviceId": ${prop.deviceId},
-            "portSwitch": ${prop.portSwitch},
+            "portType": ${prop.wan.portType},
+            "portNumber": ${prop.wan.portNumber},
+            "deviceId": ${prop.wan.deviceId},
+            "portSwitch": "null",
             "linkInfo": {
                  "linkType": "Ethernet",
                  "cellular": "null",
@@ -35,4 +35,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-del.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-del.json
new file mode 100644
index 00000000..5459625d
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-del.json
@@ -0,0 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - CCSDK
+ * ================================================================================
+ * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+{
+    "tnps": [
+        {
+            "id": ${prop.wan.wanPortId},            
+        }
+    ]
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port.json
index 2e437611..6dfb9972 100644
--- a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port.json
@@ -21,36 +21,36 @@
 {
     "tnps": [
         {
-            "name": ${prop.name},
-            "siteId": ${prop.siteId},
-            "deviceId": ${prop.deviceId},
-            "portId": ${prop.wanId},
+            "name": ${prop.wan.name},
+            "siteId": ${prop.wan.siteId},
+            "deviceId": ${prop.wan.deviceId},
+            "portId": ${prop.wan.devicePortId},
             "inSubInterfaces": "false",
-            "vlanId": ${prop.vlanId},
+            "vlanId": ${prop.wan.vlanId},
             "ipConnection": {
                 "ipv4": {
-                    "publicIP": ${prop.ipAddress},
+                    "publicIP": ${prop.wan.ip-address},
                     "accessType": "IPOE",
                     "ipMode": "Static",
-                    "customerAddress": ${prop.ipAddress},
-                    "prefixLength": ${prop.prefixLength},
-                    "providerAddress": ${prop.providerAddress},
+                    "customerAddress": ${prop.wan.ip-address},
+                    "prefixLength": ${prop.wan.prefixLength},
+                    "providerAddress": ${prop.wan.providerIpAddress},
                     "peerIp": "null",
                     "userName": "null",
                     "userKey": "null"
                 }
              },
              "transportNetworkInfo": {
-                 "transportNetworkId": ${prop.transportNetworkId},
+                 "transportNetworkId": ${prop.wan.transportNetworkId},
                  "workMode": "active"
              },
             "attributes": {
-                "inputBandwidth": ${prop.inputBandwidth},
-                "outputBandwidth": ${prop.outputBandwidth},
+                "inputBandwidth": ${prop.wan.inputBandwidth},
+                "outputBandwidth": ${prop.wan.outputBandwidth},
                 "mtu": 1500,
                 "TCPmss": 1200
             },
-            "description": ${description}
+            "description": ${prop.wan.description}
         }
     ]
-}
\ No newline at end of file
+}