aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic/restapi-templates
diff options
context:
space:
mode:
authorprakash.e <prakash.e@huawei.com>2018-08-15 01:47:48 +0530
committerDan Timoney <dt5972@att.com>2018-08-15 12:58:10 +0000
commit807e81260d9d2b905489e88b4d42f763e1961e47 (patch)
treeec9f40aee1a64c5895a3c8f00f278c8b2116f495 /platform-logic/restapi-templates
parent3f685b55bb87cf53c78ba5c8d0bbe032387d1282 (diff)
SDWAN Site DGs update
SDWAN site DG issue fix and update based on controlpoints modifications Change-Id: I7daae9adf610f2fd72150a2316cfd5f8d9ede6de Issue-ID: SDNC-357 Signed-off-by: Prakash.E <prakash.e@huawei.com> Former-commit-id: b7fdeb59f9c50c690d6f388cb9967c0f1da4c5ef
Diffstat (limited to 'platform-logic/restapi-templates')
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-device-del.json26
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-device.json12
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-site-del.json28
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-site.json5
4 files changed, 63 insertions, 8 deletions
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-device-del.json b/platform-logic/restapi-templates/src/main/json/sdwan-device-del.json
new file mode 100644
index 00000000..5aa5a92d
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-device-del.json
@@ -0,0 +1,26 @@
+/*-
+ * ============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=========================================================
+ */
+
+{
+ "deviceIds": [${repeat:prop.devices_length:
+ ${prop.devices[${1}]},
+ }
+ ]
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-device.json b/platform-logic/restapi-templates/src/main/json/sdwan-device.json
index 1d0ef64c..4fd47731 100644
--- a/platform-logic/restapi-templates/src/main/json/sdwan-device.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-device.json
@@ -21,13 +21,13 @@
{
"devices": [
{
- "esn": ${prop.esn},
- "deviceModel": ${prop.type},
- "name": ${prop.name},
+ "esn": ${prop.device.esn},
+ "deviceModel": ${prop.device.deviceModel},
+ "name": ${prop.device.name},
"siteId": "null",
- "description": ${prop.description},
- "systemIp": ${prop.systemip},
+ "description": ${prop.device.description},
+ "systemIp": ${prop.device.systemIP},
"tags": "null"
}
]
-} \ No newline at end of file
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-site-del.json b/platform-logic/restapi-templates/src/main/json/sdwan-site-del.json
new file mode 100644
index 00000000..c263ebcf
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-del.json
@@ -0,0 +1,28 @@
+/*-
+ * ============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=========================================================
+ */
+
+{
+ "sites": [
+ {
+ "id": ${prop.site.siteId}
+ }
+ ]
+}
+
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-site.json b/platform-logic/restapi-templates/src/main/json/sdwan-site.json
index 9d9fba4b..993a1a4a 100644
--- a/platform-logic/restapi-templates/src/main/json/sdwan-site.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-site.json
@@ -45,7 +45,7 @@
"role": [${repeat:prop.site.roles_length:
${prop.site.roles[${1}]},
}
- ],
+ ],
"controlPoints": [${repeat:prop.site.controlpoints_length:
${prop.site.controlpoints[${1}]},
}
@@ -55,7 +55,8 @@
${prop.site.email[${1}]},
}
]
- }
+ },
+ "description": ${prop.site.description}
}
]
}