diff options
| author |   Dan Timoney <dt5972@att.com> | 2024-09-19 16:11:05 -0400 |
|---|---|---|
| committer |   Dan Timoney <dtimoney@att.com> | 2024-09-19 16:14:36 -0400 |
| commit | 885b4e6f6caba1d6db67cb378ecfabd56b6da5be (patch) | |
| tree | 70b7407deb16273f284d5f633e208e7de3f8d269 /platform-logic/generic-resource-api/src/main/xml/sdwan | |
| parent | 05a58c8d2f4f9c738938375e6bc521b9679598b0 (diff) | |
RFC-8040 migration
Updates to migrate from Biermann draft version of RESTCONF
to RFC 8040 version
Issue-ID: SDNC-1847
Change-Id: I1837fc3613274aa0725f2d170e9346d402189f57
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/sdwan')
47 files changed, 243 insertions, 243 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml index 01db6507..2495fb05 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-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`' />
</set>
<set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
+ + '/allotted-resource-data/connection-attachment-topology?content=config'` " />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
@@ -84,7 +84,7 @@ <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>
<parameter name="outputPath" value="tmp.ar-url-psd"/>
<parameter name="target" value="{service-instance-id}"/>
<parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
@@ -156,7 +156,7 @@ <parameter name='prop.ar-parent-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>
<parameter name="outputPath" value="tmp.ar-url-connection"/>
<parameter name="target" value="{service-instance-id}"/>
<parameter name="replacement" value="`$prop.ar-parent-service-instance-id`"/>
@@ -200,7 +200,7 @@ <parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>
<parameter name="outputPath" value="tmp.ar-url-connection"/>
<parameter name="target" value="{service-instance-id}"/>
<parameter name="replacement" value="`$prop.ar-service-instance-id`"/>
@@ -460,9 +460,9 @@ <set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
- <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='service-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="allotted-resource"
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml index 2b20f06e..f2e8c9df 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml @@ -34,9 +34,9 @@ </outcome>
</switch>
<set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
+ + '/allotted-resource-data/connection-attachment-topology?content=config'` " />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
@@ -232,9 +232,9 @@ value="`$connection-attachment-ar-identifiers.`" /> <set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
- <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='service-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="allotted-resource"
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml index 6d679367..ae789f93 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.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`' />
</set>
<set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
+ + '/allotted-resource-data/connection-attachment-topology?content=config'` " />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
@@ -84,7 +84,7 @@ <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>
<parameter name="outputPath" value="tmp.ar-url-psd"/>
<parameter name="target" value="{service-instance-id}"/>
<parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
@@ -194,7 +194,7 @@ <parameter name='prop.ar-parent-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>
<parameter name="outputPath" value="tmp.ar-url-connection"/>
<parameter name="target" value="{service-instance-id}"/>
<parameter name="replacement" value="`$prop.ar-parent-service-instance-id`"/>
@@ -238,7 +238,7 @@ <parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>
<parameter name="outputPath" value="tmp.ar-url-connection"/>
<parameter name="target" value="{service-instance-id}"/>
<parameter name="replacement" value="`$prop.ar-service-instance-id`"/>
@@ -501,9 +501,9 @@ <set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
- <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='service-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="allotted-resource"
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml index 9f9121c8..e105898d 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.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`' />
</set>
<set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
+ + '/allotted-resource-data/connection-attachment-topology?content=config'` " />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
@@ -88,7 +88,7 @@ <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>
<parameter name="outputPath" value="tmp.ar-url-psd"/>
<parameter name="target" value="{service-instance-id}"/>
<parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
@@ -155,9 +155,9 @@ <set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
- <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='service-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource'
key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml index db4a18c4..e4c87377 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml @@ -242,7 +242,7 @@ </set>
<set>
<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
- <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` " />
+ <parameter name="network-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $network-topology-operation-input.network-information.network-id + '/network-data?content=config'` " />
</set>
<set>
<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Active' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml index 70500ccf..bc67c091 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml @@ -67,7 +67,7 @@ </set>
<set>
<parameter name='networkId' value='`$prop.sdwan.network-id`' />
- <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sdwan.network-id + '/network-data/'` " />
+ <parameter name="network-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sdwan.network-id + '/network-data?content=config'` " />
</set>
<set>
<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />
@@ -83,7 +83,7 @@ <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sdwan.network-id + '/network-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sdwan.network-id + '/network-data?content=config'` " />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml index f2d0b1bf..3fec0439 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml @@ -168,7 +168,7 @@ </set>
<set>
<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
- <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` " />
+ <parameter name="network-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $network-topology-operation-input.network-information.network-id + '/network-data?content=config'` " />
</set>
<set>
<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml index afd579de..c03a6ff3 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml @@ -20,7 +20,7 @@ </set>
<set>
<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
- <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='service-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service/'
+ $network-topology-operation-input.service-information.service-instance-id
+ '/service-data/service-topology/'` " />
</set>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-activate.xml index 4bd38211..1a4c3bf8 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-activate.xml @@ -283,23 +283,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml index 15bbecf7..226aa035 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml @@ -125,23 +125,23 @@ </set>
<set>
<parameter name='vf-module-id' value='`$prop.vf-id`'/>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $prop.vf-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status' value='Created' />
@@ -165,7 +165,7 @@ <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module=' + $prop.vf-id + '/vf-module-data?content=config'` " />
</save>
</outcome>
<outcome value='false'>
@@ -184,7 +184,7 @@ <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module=' + $prop.vf-id + '/vf-module-data?content=config'` " />
</update>
</outcome>
</switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-deactivate.xml index 5a1bc3da..7928c004 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-deactivate.xml @@ -157,23 +157,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-delete.xml index 995ecff8..38bf1272 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-delete.xml @@ -108,23 +108,23 @@ <parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen]." value=""/>
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<switch test="`$prop.device.sdncCreate`">
<outcome value='true'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml index 7a6c7273..7a5e27de 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml @@ -448,23 +448,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='Active' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml index 27f1c435..f8cd203a 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml @@ -90,23 +90,23 @@ </set>
<set>
<parameter name='vf-module-id' value='`$prop.vf-id`'/>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status' value='Created' />
@@ -126,7 +126,7 @@ <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data?content=config'` " />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml index 9a814918..dfdb0e7c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml @@ -429,23 +429,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml index 7a7dba27..b456547d 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml @@ -117,23 +117,23 @@ <parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen]." value=""/>
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config'
key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-activate.xml index 8ac59719..941bfff8 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-activate.xml @@ -221,23 +221,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='Active' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml index b88f3af5..01237e14 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml @@ -81,23 +81,23 @@ </set>
<set>
<parameter name='vf-module-id' value='`$prop.site-vf-index`' />
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $prop.site-vf-index
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status' value='Created' />
@@ -115,7 +115,7 @@ <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.site-vf-index + '/vf-module-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module=' + $prop.site-vf-index + '/vf-module-data?content=config'` " />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-deactivate.xml index 1fcddf64..c8e63ad5 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-deactivate.xml @@ -183,23 +183,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml index a108518a..48e1fffc 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml @@ -108,23 +108,23 @@ <parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen]." value=""/>
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml index 40477c38..ecab84c6 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml @@ -129,23 +129,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='Active' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml index 7d8950ad..cc87753a 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml @@ -81,23 +81,23 @@ </set>
<set>
<parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $prop.vpn-vf-index
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status' value='Created' />
@@ -113,7 +113,7 @@ <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module=' + $prop.vpn-vf-index + '/vf-module-data?content=config'` " />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml index b41efbc0..6b745810 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml @@ -124,23 +124,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-delete.xml index 5ddf41f1..47f824d9 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-delete.xml @@ -55,23 +55,23 @@ <parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length" value='`$prop.vnfidxLen`'/>
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen]." value=""/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml index 288dd5d9..db716ce7 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml @@ -440,23 +440,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='Active' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml index a25f727e..b3b1398d 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml @@ -81,23 +81,23 @@ </set>
<set>
<parameter name='vf-module-id' value='`$prop.wan-port-vf-index`' />
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $prop.wan-port-vf-index
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status' value='Created' />
@@ -122,7 +122,7 @@ <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.wan-port-vf-index + '/vf-module-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module=' + $prop.wan-port-vf-index + '/vf-module-data?content=config'` " />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.xml index b0cccdf3..953d232e 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.xml @@ -167,23 +167,23 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml index 710925da..4fa62345 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml @@ -105,23 +105,23 @@ <parameter name="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen]." value=""/>
</set>
<set>
- <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vf-modules/vf-module/'
+ + '/vnf-data/vf-modules/vf-module='
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id
- + '/vf-module-data/vf-module-topology/'`"/>
+ + '/vf-module-data/vf-module-topology?content=config'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/vnfs/vnf/'
+ + '/service-data/vnfs/vnf='
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
- + '/vnf-data/vnf-topology/'`"/>
+ + '/vnf-data/vnf-topology?content=config'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vf-module-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='site-resource'
key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-topology-operation-zte-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-topology-operation-zte-create.xml index 03ccd49a..b39498ec 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-topology-operation-zte-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-topology-operation-zte-create.xml @@ -17,7 +17,7 @@ <block> <set> <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' /> - <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` " /> + <parameter name="network-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $network-topology-operation-input.network-information.network-id + '/network-data?content=config'` " /> </set> </block> </outcome> diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-topology-operation-zte-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-topology-operation-zte-delete.xml index 9c24e525..7f720da6 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-topology-operation-zte-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-topology-operation-zte-delete.xml @@ -36,7 +36,7 @@ </set> <set> <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`"/> - <parameter name="service-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology/'` "/> + <parameter name="service-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology?content=config'` "/> </set> </block> </outcome> @@ -61,7 +61,7 @@ </set> <set> <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`"/> - <parameter name="service-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology/'` "/> + <parameter name="service-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology?content=config'` "/> </set> </block> </outcome> diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml index 54bae832..1c7daefb 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml @@ -119,7 +119,7 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data?content=config'` " />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml index ab122cc1..43f7eb34 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml @@ -89,7 +89,7 @@ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-device-param' mode='sync' ></call>
<set>
<parameter name='vnfId' value='`$prop.vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $prop.vnf-id + '/vnf-data?content=config'` " />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />
@@ -121,7 +121,7 @@ <parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $prop.vnf-id + '/vnf-data?content=config'` " />
</save>
</outcome>
<outcome value='false'>
@@ -140,7 +140,7 @@ <parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $prop.vnf-id + '/vnf-data?content=config'` " />
</update>
</outcome>
</switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml index d2a8129a..b7105454 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml @@ -120,7 +120,7 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data?content=config'` " />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml index de29db48..79c2f862 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml @@ -97,9 +97,9 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name='vnf-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vnf-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vnf-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'` " />
+ + '/service-data/service-topology?content=config'` " />
</set>
<switch test="`$prop.device.sdncCreate`">
<outcome value='true'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml index 720c1da2..7acf5667 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml @@ -313,7 +313,7 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data?content=config'` " />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml index a182dc54..299b7969 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml @@ -72,7 +72,7 @@ </set>
<set>
<parameter name='vnfId' value='`$prop.vnf-index`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $prop.vnf-index + '/vnf-data?content=config'` " />
</set>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config'
key='wan-port-config.wan-port-config-id = $prop.vnf-index' >
@@ -92,7 +92,7 @@ <parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $prop.vnf-index + '/vnf-data?content=config'` " />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml index fa3d885f..760cd6fc 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml @@ -113,7 +113,7 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data?content=config'` " />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml index 9f9eb3b1..58b5b607 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml @@ -87,9 +87,9 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name='vnf-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vnf-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vnf-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'` " />
+ + '/service-data/service-topology?content=config'` " />
</set>
<delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='wan-port-config'
key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml index d075c21d..9c2fe8f6 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml @@ -208,7 +208,7 @@ </block>
</for>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>
<parameter name="outputPath" value="tmp.ar-url-parent-connection"/>
<parameter name="target" value="{service-instance-id}"/>
<parameter name="replacement" value="`$prop.parent-service-instance-id`"/>
@@ -325,7 +325,7 @@ <parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="source" value="/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data?content=config"/>
<parameter name="outputPath" value="tmp.ar-url-connection"/>
<parameter name="target" value="{service-instance-id}"/>
<parameter name="replacement" value="`$prop.ar-service-instance-id`"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml index 4c0e09f1..4ad66ac5 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml @@ -203,7 +203,7 @@ </set>
<set>
<parameter name='vnfId' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data?content=config'` " />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml index f431eb64..4c23fcff 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml @@ -66,7 +66,7 @@ </set>
<set>
<parameter name='vnfId' value='`$prop.vnf-index`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $prop.vnf-index + '/vnf-data?content=config'` " />
</set>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource'
key='site-resource.site-resource-id = $prop.vnf-index' >
@@ -79,7 +79,7 @@ <parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />
<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />
- <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` " />
+ <parameter name='selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $prop.vnf-index + '/vnf-data?content=config'` " />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml index 4f90141d..0aca08ac 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml @@ -168,7 +168,7 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data?content=config'` " />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml index 38f118fc..9d93291b 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml @@ -87,9 +87,9 @@ </set> <set> <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /> - <parameter name='vnf-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + <parameter name='vnf-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id - + '/service-data/service-topology/'` " /> + + '/service-data/service-topology?content=config'` " /> </set> <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='site-resource' key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete> diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.xml index 86099f33..055a56fb 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.xml @@ -54,7 +54,7 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data?content=config'` " />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml index ceff5bad..757975e8 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml @@ -79,7 +79,7 @@ </set>
<set>
<parameter name='vnfId' value='`$prop.vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $prop.vnf-id + '/vnf-data?content=config'` " />
</set>
<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-deactivate.xml index 95c67071..fc888faf 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-deactivate.xml @@ -66,7 +66,7 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data?content=config'` " />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml index 87e6c528..f1c8553b 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml @@ -78,9 +78,9 @@ </set>
<set>
<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
- <parameter name='vnf-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='vnf-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vnf-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'` " />
+ + '/service-data/service-topology?content=config'` " />
</set>
<delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
|