summaryrefslogtreecommitdiffstats
path: root/platform-logic/restapi-templates/src/main
diff options
context:
space:
mode:
authorshashikanth.vh <shashikanth.vh@huawei.com>2018-09-07 14:38:22 +0530
committershashikanth.vh <shashikanth.vh@huawei.com>2018-09-07 17:24:17 +0530
commit55b429cfc73802e3e52fa2f3864ecc4cdd552728 (patch)
tree5eee99f5b0b7e039ea0250d5549ca25aae74fd04 /platform-logic/restapi-templates/src/main
parentdb323d0fa39eabc03faf8c803876da5f87079e58 (diff)
integration test issues fix for sdwan and sotn
Change-Id: I406550404f0cfb661d6e480cf1df48d39fad06e7 Issue-ID: SDNC-357 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com> Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682
Diffstat (limited to 'platform-logic/restapi-templates/src/main')
-rw-r--r--platform-logic/restapi-templates/src/main/json/actokentemplate.json20
-rw-r--r--platform-logic/restapi-templates/src/main/json/oof-getpath.json21
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-device-del.json1
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json24
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-port.json9
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-site-del.json1
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-site-hub.json30
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-site-spoke.json (renamed from platform-logic/restapi-templates/src/main/json/sdwan-site.json)20
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-tenant.json6
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-underlay.json29
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-vpn-create.json9
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology-create.json11
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology.json11
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-vpn.json1
-rw-r--r--platform-logic/restapi-templates/src/main/json/sdwan-wan-port.json21
15 files changed, 118 insertions, 96 deletions
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.json b/platform-logic/restapi-templates/src/main/json/sdwan-site-spoke.json
index 3e40fb92..1e50e76f 100644
--- a/platform-logic/restapi-templates/src/main/json/sdwan-site.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-spoke.json
@@ -7,20 +7,16 @@
{
"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}
+ "postcode": ${prop.site.location-postcode}
}
],
-
"devices": [${repeat:prop.site.deviceId_length:
{
- "deviceId":${prop.site.deviceId[${1}]},
+ "deviceId": ${prop.site.deviceId[${1}]},
"locationName": ${prop.site.location-name},
},
}
],
-
"siteType": ${prop.site.type},
"role": [${repeat:prop.site.roles_length:
${prop.site.roles[${1}]},
@@ -29,14 +25,10 @@
"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}
+ ],
+ "description": "--------role:dsvpn-hub---------------"
}
]
}
+
+
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}
}
]