diff options
18 files changed, 114 insertions, 353 deletions
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-attachment-allotted-resource.json b/platform-logic/restapi-templates/src/main/json/sdwan-attachment-allotted-resource.json new file mode 100644 index 00000000..8cbf39da --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-attachment-allotted-resource.json @@ -0,0 +1,100 @@ +{ + "connection-attachment-allotted-resource": [{ + "allotted-resource-id": ${connection-attachment-ar.allotted-resource-id}, + "allotted-resource-data": { + "allotted-resource-operation-information": { + "allotted-resource-information": { + "allotted-resource-id": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-id}, + "allotted-resource-type": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-type}, + "parent-service-instance-id": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id}, + "onap-model-information": { + "model-invariant-uuid": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-customization-uuid}, + "model-uuid": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-uuid}, + "model-version": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-version} + } + }, + "sdnc-request-header": { + "svc-request-id": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id}, + "svc-action": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-action} + }, + "request-information": { + "request-id": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-id}, + "source": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.source}, + "order-version": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-version}, + "order-number": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-number}, + "notification-url": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.notification-url}, + "request-action": ${connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action} + }, + "connection-attachment-request-input": { + "param": [ + { + "name": "sdwanVpnName", + "value": ${prop.connection-attachment.sdwanVpnName} + }, + { + "name": "role", + "value": ${prop.connection-attachment.role} + } + ] + } + }, + "connection-attachment-topology": { + "allotted-resource-identifiers": { + "consuming-service-instance-id": ${connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id}, + "allotted-resource-name": ${connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.allotted-resource-name}, + "allotted-resource-id": ${connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.allotted-resource-id}, + "parent-service-instance-id": ${connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.parent-service-instance-id}, + "allotted-resource-type": ${connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.allotted-resource-type} + }, + "onap-model-information": { + "model-invariant-uuid": ${connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.model-customization-uuid}, + "model-uuid": ${connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.model-uuid}, + "model-version": ${connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.model-version} + }, + "connection-attachment-parameters": { + "param": [ + { + "name": "sdwanVpnName", + "value": ${prop.connection-attachment.sdwanVpnName} + }, + { + "name": "role", + "value": ${prop.connection-attachment.role} + } + ] + } + }, + "connection-attachment-parameters": { + "param": [ + { + "name": "sdwanVpnName", + "value": ${prop.connection-attachment.sdwanVpnName} + }, + { + "name": "role", + "value": ${prop.connection-attachment.role} + } + ] + }, + "allotted-resource-oper-status": { + "last-action": ${connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action}, + "modify-timestamp": ${connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.modify-timestamp}, + "last-order-status": ${connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-order-status}, + "create-timestamp": ${connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp}, + "order-status": ${connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status}, + "last-rpc-action": ${connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action}, + "last-svc-request-id": ${connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id} + }, + }, + "allotted-resource-status" : { + "action": ${connection-attachment-ar.allotted-resource-status.action}, + "rpc-name": ${connection-attachment-ar.allotted-resource-status.rpc-name}, + "rpc-action": ${connection-attachment-ar.allotted-resource-status.rpc-action} + } + }] +} + + + 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 5aa5a92d..4d3c15a8 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 @@ -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========================================================= - */ - { "deviceIds": [${repeat:prop.devices_length: ${prop.devices[${1}]}, diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-device-port-del.json b/platform-logic/restapi-templates/src/main/json/sdwan-device-port-del.json index 243af571..e801839c 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-device-port-del.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-device-port-del.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========================================================= - */ - { "ports": [ { 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 4fd47731..53dfc86e 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-device.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-device.json @@ -1,33 +1,13 @@ -/*- - * ============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========================================================= - */ - { "devices": [ { "esn": ${prop.device.esn}, "deviceModel": ${prop.device.deviceModel}, "name": ${prop.device.name}, - "siteId": "null", + "siteId": null, "description": ${prop.device.description}, "systemIp": ${prop.device.systemIP}, - "tags": "null" + "tags": null } ] } 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 5bf235f7..101723cf 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,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========================================================= - */ - { "bgpAsNum": 65101, "vpnType": "dsvpn", 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 a1402488..694d3a67 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-port.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-port.json @@ -1,38 +1,18 @@ -/*- - * ============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========================================================= - */ - { "ports": [ { "portType": ${prop.wan.portType}, "portNumber": ${prop.wan.portNumber}, "deviceId": ${prop.wan.deviceId}, - "portSwitch": "null", + "portSwitch": null, "linkInfo": { "linkType": "Ethernet", - "cellular": "null", - "atm": "null", + "cellular": null, + "atm": null, "ethernet": { "negotiateMode": "auto", - "media": "null", - "duplex": "null", + "media": null, + "duplex": null, "speed" : "10" } } 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 c263ebcf..60cd98a4 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 @@ -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========================================================= - */ - { "sites": [ { 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 index ad450761..238fa46b 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-site-provision.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-provision.json @@ -1,29 +1,9 @@ -/*- - * ============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", + "encryptionKey":null, "validityPeriod":3 } 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 993a1a4a..3e40fb92 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-site.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-site.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========================================================= - */ - { "sites": [ { 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 fb12da7d..a32136a0 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-tenant.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========================================================= - */ - { "tenantName": ${prop.customer-id}, "tenantEmail": "test@test.com", 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 2bde4b8b..eed2c32e 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json @@ -1,22 +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========================================================= -*/ { "routes": [ { @@ -30,7 +11,7 @@ "nextHopType": "ip-address", "ipAddress": ${prop.route.ipAddress}, "track": "false", - "target": "null" + "target": null } ] } diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-delete.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-delete.json index 99677171..93b68f71 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-delete.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-delete.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========================================================= - */ - { "vpns": [ { 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 ac6b3f67..6d22cb9e 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 @@ -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========================================================= - */ - { "vpnId": ${prop.vpn1Id}, "areas": [ @@ -32,7 +12,7 @@ "role": ${prop.siteAttachement[${1}].role}, "workMode": "with-interconnection", "sitePriority": "active", - "borders": "null" + "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 3654fb7c..ce3b65d3 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn.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========================================================= - */ - { "vpns": [ { diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-del.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-del.json index 5459625d..bdd22166 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-del.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-del.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========================================================= - */ - { "tnps": [ { 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 ada44a38..e3c45939 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 @@ -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========================================================= - */ - { "tnps": [ { @@ -26,7 +6,7 @@ "deviceId": ${prop.wan.deviceId}, "portId": ${prop.wan.devicePortId}, "inSubInterfaces": "false", - "vlanId": "null", + "vlanId": null, "ipConnection": { "ipv4": { "publicIP": ${prop.wan.ip-address}, @@ -35,9 +15,9 @@ "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": { diff --git a/platform-logic/restapi-templates/src/main/json/sotn-attachment-allotted-resource.json b/platform-logic/restapi-templates/src/main/json/sotn-attachment-allotted-resource.json index 886569b8..4929b4a9 100644 --- a/platform-logic/restapi-templates/src/main/json/sotn-attachment-allotted-resource.json +++ b/platform-logic/restapi-templates/src/main/json/sotn-attachment-allotted-resource.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========================================================= - */ - { "connection-attachment-allotted-resource": [{ "allotted-resource-id": ${connection-attachment-ar.allotted-resource-id}, diff --git a/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json b/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json index ab8aaae7..582e88e3 100644 --- a/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json +++ b/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.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========================================================= - */ - { "ietf-eth-tran-service:etht-svc": { "globals": { |