CCVPN RestApi template changes

[sdnc/oam.git] / platform-logic / restapi-templates / src / main / json / sotn-ethernet-service.json

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 b5a371a..582e88e 100644 (file)
--- 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,30 +1,10 @@
-/*-
- * ============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": {
             "etht-svc-bandwidth-profiles": [
                 {
                     "bandwidth-profile-name": ${prop.global.sotn.bandwidth-profile-name},
-                    "bandwidth-profile-type": "mef-10-bwp",
+                    "bandwidth-profile-type": "ietf-eth-tran-types:mef-10-bwp",
                     "CIR": ${prop.global.sotn.cir},
                     "EIR": ${prop.global.sotn.eir},
                     "color-aware": ${prop.global.sotn.colorAware},
@@ -38,29 +18,21 @@
                 "access-provider-id": ${oof.vpn.access-provider-id},
                 "access-client-id": ${oof.vpn.access-client-id},
                 "access-topology-id": ${oof.vpn.access-topology-id},
-                "etht-svc-type": "p2p-svc",
-                "admin-status": "tunnel-state-up",
+                "etht-svc-type": "ietf-eth-tran-types:p2p-svc",
+                "admin-status": "ietf-te-types:tunnel-state-up",
                 "etht-svc-access-ports": [
                     {
-                        "access-port-id": 0,
+                        "access-port-id": "0",
                         "access-node-id": ${oof.vpn.access-node-id},
                         "access-ltp-id": ${oof.vpn.src-access-ltp-id},
-                        "service-classification-type": "vlan-classification",
-                        "outer-tag": {
-                            "tag-type": "classify-c-vlan",
-                            "vlan-value": ${prop.connection-attachment.cVLAN}
-                        },
+                        "service-classification-type": "ietf-eth-tran-types:port-classification",
                         "ingress-egress-bandwidth-profile-name": ${prop.global.sotn.bandwidth-profile-name}
                     },
                     {
-                        "access-port-id": 1,
+                        "access-port-id": "1",
                         "access-node-id": ${oof.vpn.access-node-id},
                         "access-ltp-id": ${oof.vpn.dst-access-ltp-id},
-                        "service-classification-type": "vlan-classification",
-                        "outer-tag": {
-                            "tag-type": "classify-c-vlan",
-                            "vlan-value": ${prop.connection-attachment.cVLAN}
-                        },
+                        "service-classification-type": "ietf-eth-tran-types:port-classification",
                         "ingress-egress-bandwidth-profile-name": ${prop.global.sotn.bandwidth-profile-name}
                     }
                 ]