From 55b429cfc73802e3e52fa2f3864ecc4cdd552728 Mon Sep 17 00:00:00 2001 From: "shashikanth.vh" Date: Fri, 7 Sep 2018 14:38:22 +0530 Subject: integration test issues fix for sdwan and sotn Change-Id: I406550404f0cfb661d6e480cf1df48d39fad06e7 Issue-ID: SDNC-357 Signed-off-by: shashikanth.vh Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682 --- .../src/main/json/actokentemplate.json | 20 ----------- .../src/main/json/oof-getpath.json | 21 +---------- .../src/main/json/sdwan-device-del.json | 1 + .../src/main/json/sdwan-network-orchestration.json | 24 +++++++++---- .../src/main/json/sdwan-port.json | 9 ++--- .../src/main/json/sdwan-site-del.json | 1 + .../src/main/json/sdwan-site-hub.json | 30 ++++++++++++++++ .../src/main/json/sdwan-site-spoke.json | 34 ++++++++++++++++++ .../src/main/json/sdwan-site.json | 42 ---------------------- .../src/main/json/sdwan-tenant.json | 6 ++-- .../src/main/json/sdwan-underlay.json | 29 ++++++++------- .../src/main/json/sdwan-vpn-create.json | 9 +++++ .../src/main/json/sdwan-vpn-topology-create.json | 11 ++++++ .../src/main/json/sdwan-vpn-topology.json | 11 +++--- .../restapi-templates/src/main/json/sdwan-vpn.json | 1 + .../src/main/json/sdwan-wan-port.json | 21 +++++++---- 16 files changed, 146 insertions(+), 124 deletions(-) create mode 100644 platform-logic/restapi-templates/src/main/json/sdwan-site-hub.json create mode 100644 platform-logic/restapi-templates/src/main/json/sdwan-site-spoke.json delete mode 100644 platform-logic/restapi-templates/src/main/json/sdwan-site.json create mode 100644 platform-logic/restapi-templates/src/main/json/sdwan-vpn-create.json create mode 100644 platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology-create.json (limited to 'platform-logic/restapi-templates/src/main/json') diff --git a/platform-logic/restapi-templates/src/main/json/actokentemplate.json b/platform-logic/restapi-templates/src/main/json/actokentemplate.json index 31bf0ee2..934b9b46 100644 --- a/platform-logic/restapi-templates/src/main/json/actokentemplate.json +++ b/platform-logic/restapi-templates/src/main/json/actokentemplate.json @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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========================================================= - */ { "userName": ${prop.sdncRestApi.thirdpartySdnc.user}, diff --git a/platform-logic/restapi-templates/src/main/json/oof-getpath.json b/platform-logic/restapi-templates/src/main/json/oof-getpath.json index f407f64b..feab0bc0 100644 --- a/platform-logic/restapi-templates/src/main/json/oof-getpath.json +++ b/platform-logic/restapi-templates/src/main/json/oof-getpath.json @@ -1,23 +1,3 @@ -/*- - * ============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========================================================= - */ - { "srcPort": { "src-access-topology-id": ${prop.connection-attachment.access-topology-id}, @@ -34,3 +14,4 @@ "dst-access-ltp-id": ${prop.remote.connection-attachment.access-ltp-id} } } + 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 index 4d3c15a8..efe5fdd0 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-device-del.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-device-del.json @@ -4,3 +4,4 @@ } ] } + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json b/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json index 101723cf..a871f114 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json @@ -1,13 +1,25 @@ { - "bgpAsNum": 65101, + "bpgAsNum": 65101, "vpnType": "dsvpn", - "siteScale": 30, + "siteScale":"30", "dsvpnIPpool": ["100.1.0.0/16"], - "innerTunnelPool": ["101.1.0.0/16"], + "innerTunnelIPpool": [ + "101.1.0.0/16" + ], "interConnectIPpool": "102.1.0.0/16", - "transportNetworks": [ {} ], + "transportNetworks": [ + { + "name": "net001", + "routingDomain": "routing001", + "description": "string" + } + ], + "routingDomain":[{ + "name": "routing001", + "ipsecEncryption":false + }], "ipsecEncryptionParameter": { - "encryptionAlgorithm": "AES128", - "preSharedKey": "Admin@12134", + "encrptionAlgorithm":"AES128", + "preSharedKey": "Admin@12134==========================================" } } \ No newline at end of file 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 694d3a67..8d937586 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-port.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-port.json @@ -4,16 +4,11 @@ "portType": ${prop.wan.portType}, "portNumber": ${prop.wan.portNumber}, "deviceId": ${prop.wan.deviceId}, - "portSwitch": null, + "portSwitch": "layer3-port", "linkInfo": { "linkType": "Ethernet", - "cellular": null, - "atm": null, "ethernet": { - "negotiateMode": "auto", - "media": null, - "duplex": null, - "speed" : "10" + "negotiationMode": "auto" } } } 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 index 60cd98a4..daa6a335 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-site-del.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-del.json @@ -6,3 +6,4 @@ ] } + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-site-hub.json b/platform-logic/restapi-templates/src/main/json/sdwan-site-hub.json new file mode 100644 index 00000000..1dcedd9b --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-hub.json @@ -0,0 +1,30 @@ +{ + "sites": [ + { + "name": ${prop.site.name}, + "locations": [ + { + "name": ${prop.site.location-name}, + "address": ${prop.site.location-address}, + "postcode": ${prop.site.location-postcode} + } + ], + "devices": [${repeat:prop.site.deviceId_length: + { + "deviceId": ${prop.site.deviceId[${1}]}, + "locationName": ${prop.site.location-name}, + }, + } + ], + "siteType": ${prop.site.type}, + "role": [${repeat:prop.site.roles_length: + ${prop.site.roles[${1}]}, + } + ], + "controlPoints": [], + "description": "--------role:dsvpn-hub---------------" + } + ] +} + + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-site-spoke.json b/platform-logic/restapi-templates/src/main/json/sdwan-site-spoke.json new file mode 100644 index 00000000..1e50e76f --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-spoke.json @@ -0,0 +1,34 @@ +{ + "sites": [ + { + "id": "", + "name": ${prop.site.name}, + "locations": [ + { + "name": ${prop.site.location-name}, + "address": ${prop.site.location-address}, + "postcode": ${prop.site.location-postcode} + } + ], + "devices": [${repeat:prop.site.deviceId_length: + { + "deviceId": ${prop.site.deviceId[${1}]}, + "locationName": ${prop.site.location-name}, + }, + } + ], + "siteType": ${prop.site.type}, + "role": [${repeat:prop.site.roles_length: + ${prop.site.roles[${1}]}, + } + ], + "controlPoints": [${repeat:prop.site.controlpoints_length: + ${prop.site.controlpoints[${1}]}, + } + ], + "description": "--------role:dsvpn-hub---------------" + } + ] +} + + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-site.json b/platform-logic/restapi-templates/src/main/json/sdwan-site.json deleted file mode 100644 index 3e40fb92..00000000 --- a/platform-logic/restapi-templates/src/main/json/sdwan-site.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "sites": [ - { - "id": "", - "name": ${prop.site.name}, - "locations": [ - { - "name": ${prop.site.location-name}, - "address": ${prop.site.location-address}, - "postcode": ${prop.site.location-postcode}, - "latitude": ${prop.site.location-latitude}, - "longitude": ${prop.site.location-longitude} - } - ], - - "devices": [${repeat:prop.site.deviceId_length: - { - "deviceId":${prop.site.deviceId[${1}]}, - "locationName": ${prop.site.location-name}, - }, - } - ], - - "siteType": ${prop.site.type}, - "role": [${repeat:prop.site.roles_length: - ${prop.site.roles[${1}]}, - } - ], - "controlPoints": [${repeat:prop.site.controlpoints_length: - ${prop.site.controlpoints[${1}]}, - } - ], - "contact":{ - "emails":[${repeat:prop.site.email_length: - ${prop.site.email[${1}]}, - } - ] - }, - "description": ${prop.site.description} - } - ] -} diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json b/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json index a32136a0..6161b1bd 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json @@ -1,12 +1,12 @@ { "tenantName": ${prop.customer-id}, - "tenantEmail": "test@test.com", + "tenantEmail": ${prop.userEmail}, "tenantPhone": "8888888888", "tenantDescription": "This is a test tenant created by ONAP", "tenantAddress": "Road123", "limitAccountNum": 1000, - "userAccount": "test@test.com", - "userEmail": "test@test.com", + "userAccount": ${prop.userAccount}, + "userEmail": ${prop.userEmail}, "sendInitEmailEnable": "true", "countryCode": "CN", "userPassword": "Test@12345" 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 eed2c32e..ed6161b8 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json @@ -1,18 +1,17 @@ { - "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 - } - ] + "routes": [ + { + "id": ${prop.route.id}, + "vpnId": ${prop.vpnId}, + "siteId": ${prop.route.siteId}, + "deviceId": ${prop.route.deviceId}, + "destinationAddressMask": ${prop.route.providerIpAddress}, + "priority": 60, + "nextHopType": "ip-address", + "ipAddress": ${prop.route.ipAddress}, + "track": false, + "target": null + } + ] } diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-create.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-create.json new file mode 100644 index 00000000..d6814d5c --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-create.json @@ -0,0 +1,9 @@ +{ + "vpns": [ + { + "name": ${prop.name}, + "id": ${prop.vpn1Id} + } + ] +} + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology-create.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology-create.json new file mode 100644 index 00000000..713ef759 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology-create.json @@ -0,0 +1,11 @@ +{ + "vpnId": ${prop.vpn1Id}, + "areas": [ + { + "name": "area1", + "areaType": "backbone", + "topologyType": ${prop.topology} + } + ] +} + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology.json index 6d22cb9e..89da9a28 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology.json @@ -3,13 +3,14 @@ "areas": [ { "name": "area1", - "areaType": "leaf", + "areaType": "backbone", "topologyType": ${prop.topology}, - "siteAttachements": [${repeat:prop.siteAttachement_length: - {"siteId": [${repeat:prop.siteAttachement[${1}].siteId_length: - ${prop.siteAttachement[${1}].siteId[${2}]},} + "siteAttachments": [${repeat:prop.siteAttachements_length: + {"siteId": ${prop.siteAttachements[${1}].siteId}, + "role": [${repeat:prop.siteAttachements[${1}].roles_length: + ${prop.siteAttachements[${1}].roles[${2}]}, + } ], - "role": ${prop.siteAttachement[${1}].role}, "workMode": "with-interconnection", "sitePriority": "active", "borders": null diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json index ce3b65d3..11412b41 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json @@ -2,6 +2,7 @@ "vpns": [ { "name": ${prop.name}, + "id": ${prop.vpn1Id}, "siteIds": [ ${repeat:prop.siteIds_length: ${prop.siteIds[${1}]}, 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 e3c45939..55e603ec 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 @@ -5,19 +5,19 @@ "siteId": ${prop.wan.siteId}, "deviceId": ${prop.wan.deviceId}, "portId": ${prop.wan.devicePortId}, - "inSubInterfaces": "false", - "vlanId": null, + "inSubInterface": false, + "vlanId": "null", "ipConnection": { "ipv4": { "publicIP": ${prop.wan.ip-address}, - "accessType": "IPOE", + "accessType": "IPoE", "ipMode": "Static", "customerAddress": ${prop.wan.ip-address}, "prefixLength": ${prop.wan.prefixLength}, "providerAddress": ${prop.wan.providerIpAddress}, - "peerIp": null, - "userName": null, - "userKey": null + "peerIp": "null", + "userName": "null", + "userKey": "null" } }, "transportNetworkInfo": { @@ -30,6 +30,15 @@ "mtu": 1500, "TCPmss": 1200 }, + "ntp": [ + { + "serverIP": "11.11.11.11", + "authentication": false, + "mode": "MD5", + "authKey": "123456", + "authId": 123 + } + ], "description": ${prop.wan.description} } ] -- cgit 1.2.3-korg