From 807e81260d9d2b905489e88b4d42f763e1961e47 Mon Sep 17 00:00:00 2001 From: "prakash.e" Date: Wed, 15 Aug 2018 01:47:48 +0530 Subject: 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 Former-commit-id: b7fdeb59f9c50c690d6f388cb9967c0f1da4c5ef --- .../src/main/json/sdwan-device-del.json | 26 ++++++++++++++++++++ .../src/main/json/sdwan-device.json | 12 +++++----- .../src/main/json/sdwan-site-del.json | 28 ++++++++++++++++++++++ .../src/main/json/sdwan-site.json | 5 ++-- 4 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 platform-logic/restapi-templates/src/main/json/sdwan-device-del.json create mode 100644 platform-logic/restapi-templates/src/main/json/sdwan-site-del.json (limited to 'platform-logic/restapi-templates') 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} } ] } -- cgit 1.2.3-korg