Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
RFC-8040 migration
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sotn / GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index ef9278b..152ff15 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -8,9 +8,9 @@
                 <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\r
             </set>\r
             <set>\r
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\r
+                <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource='\r
  + $tmp.ar.allotted-resource-id\r
- + '/allotted-resource-data/connection-attachment-topology/'` " />\r
+ + '/allotted-resource-data/connection-attachment-topology?content=config'` " />\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
@@ -87,7 +87,7 @@
                 <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>\r
+                <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>\r
                 <parameter name="outputPath" value="tmp.ar-url-psd"/>\r
                 <parameter name="target" value="{service-instance-id}"/>\r
                 <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>\r
@@ -188,8 +188,10 @@
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`">\r
                                                 <outcome value='true'>\r
                                                     <set>\r
-                                                        <parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
-                                                        <parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
+                                                        <parameter name='ietf-eth-tran-service:etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].ingress-egress-bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
+                                                        <parameter name='ietf-eth-tran-service:etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].ingress-egress-bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
                                                     </set>\r
                                                 </outcome>\r
                                             </switch>\r
@@ -217,28 +219,28 @@
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`">\r
                                                 <outcome value='true'>\r
                                                     <set>\r
-                                                        <parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].CIR' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
                                                     </set>\r
                                                 </outcome>\r
                                             </switch>\r
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`">\r
                                                 <outcome value='true'>\r
                                                     <set>\r
-                                                        <parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].EIR' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
                                                     </set>\r
                                                 </outcome>\r
                                             </switch>\r
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`">\r
                                                 <outcome value='true'>\r
                                                     <set>\r
-                                                        <parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].color-aware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
                                                     </set>\r
                                                 </outcome>\r
                                             </switch>\r
                                             <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`">\r
                                                 <outcome value='true'>\r
                                                     <set>\r
-                                                        <parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
+                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].coupling-flag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\r
                                                     </set>\r
                                                 </outcome>\r
                                             </switch>\r
@@ -454,32 +456,79 @@
                                             </return>\r
                                         </outcome>\r
                                     </execute>\r
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />\r
-                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />\r
-                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                                        <parameter name="format" value="json"/>\r
-                                        <parameter name="httpMethod" value="patch"/>\r
-                                        <parameter name="responsePrefix" value="vpn-result"/>\r
-                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                        <outcome value='failure'>\r
-                                            <return status='failure'>\r
-                                                <parameter name='ack-final' value='Y'/>\r
-                                                <parameter name="error-code" value="500" />\r
-                                                <parameter name="error-message" value="Error executing Create vpn rest api" />\r
-                                            </return>\r
+                                    <set>\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />\r
+                                    </set>\r
+                                    <set>\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\r
+                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\r
+                                    </set>\r
+                                    <switch test="`$prop.sdncRestApi.token_id`">\r
+                                        <outcome value=''>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />\r
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                                <parameter name="format" value="json"/>\r
+                                                <parameter name="httpMethod" value="patch"/>\r
+                                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />\r
+                                                <parameter name="responsePrefix" value="vpn-result"/>\r
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                <outcome value='failure'>\r
+                                                    <return status='failure'>\r
+                                                        <parameter name='ack-final' value='Y'/>\r
+                                                        <parameter name="error-code" value="500" />\r
+                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                                    </return>\r
+                                                </outcome>\r
+                                                <outcome value='success'>\r
+                                                    <block atomic="true"></block>\r
+                                                </outcome>\r
+                                            </execute>\r
                                         </outcome>\r
-                                        <outcome value='success'>\r
-                                            <block atomic="true"></block>\r
+                                        <outcome value='Other'>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />\r
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                                <parameter name="format" value="json"/>\r
+                                                <parameter name="httpMethod" value="patch"/>\r
+                                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />\r
+                                                <parameter name="responsePrefix" value="vpn-result"/>\r
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                <outcome value='failure'>\r
+                                                    <return status='failure'>\r
+                                                        <parameter name='ack-final' value='Y'/>\r
+                                                        <parameter name="error-code" value="500" />\r
+                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                                    </return>\r
+                                                </outcome>\r
+                                                <outcome value='success'>\r
+                                                    <block atomic="true"></block>\r
+                                                </outcome>\r
+                                            </execute>\r
                                         </outcome>\r
-                                    </execute>\r
+                                    </switch>\r
                                     <set>\r
-                                        <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`" />\r
+                                        <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-name`" />\r
                                     </set>\r
                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \r
       key='vpn-binding.vpn-id = $tmp.vpnName' >\r
@@ -583,9 +632,9 @@
             <set>\r
                 <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\r
                 <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>\r
-                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+                <parameter name='service-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='\r
  + $connection-attachment-topology-operation-input.service-information.service-instance-id\r
- + '/service-data/service-topology/'`"/>\r
+ + '/service-data/service-topology?content=config'`"/>\r
             </set>\r
             <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="allotted-resource" \r
SDNC OA&M tools