SDWAN WAN Attach site addition

Updates include:
- Addition of sdwan Attach site resource DG
- Templates
- Defect fixes

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

Former-commit-id: 28a98a71d3b3a44e7269de435f0591946f2456d1

2 files changed, 64 insertions, 34 deletions

diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-site-provision.json b/platform-logic/restapi-templates/src/main/json/sdwan-site-provision.json
new file mode 100644
index 00000000..ad450761
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-provision.json
@@ -0,0 +1,29 @@
+/*-
+ * ============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=========================================================
+ */
+
+{
+    "siteIds": [${repeat:prop.provision.hubspokesite_length:
+        ${prop.provision.hubspokesite[${1}]},
+     }
+    ],
+    "encryptionKey":"null",
+    "validityPeriod":3
+}
+
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json b/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json
index 977e2ed1..2bde4b8b 100644
--- a/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json
@@ -1,36 +1,37 @@
 /*-
- * ============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=========================================================
- */
-
+* ============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=========================================================
+*/
 {
-    "routes": [
-        {
-            "vpnId": ${prop.name},
-            "siteId": ${prop.siteIds},
-            "deviceId": ${prop.deviceId},
-            "tnpId": ${prop.hubTnpId},
-            "priority": 60,
-            "destination": ${prop.vlanId},
-            "nextHopType": "ip-address",
-            "ipAddress": ${prop.providerIpAddress},
-            "track": "false",
-            "target": "null"
-        }
-    ]
-}
\ No newline at end of file
+   "routes": [
+       {
+           "id": ${prop.route.id},
+           "vpnId": ${prop.vpnId},
+           "siteId": ${prop.route.siteId},
+           "deviceId": ${prop.route.deviceId},
+           "tnpId": ${prop.route.wanportId},
+           "priority": 60,
+           "destination": ${prop.route.providerIpAddress},
+           "nextHopType": "ip-address",
+           "ipAddress": ${prop.route.ipAddress},
+           "track": "false",
+           "target": "null"
+       }
+   ]
+}
+