diff options
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
125 files changed, 517 insertions, 517 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml index 658cee15..b19f074f 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.parent-service-instance-id' value='`$cto-api.parent-service-instance-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/contrail-route-topology/'` " /> + + '/allotted-resource-data/contrail-route-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' /> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml index 674e5470..8df40e58 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml @@ -320,9 +320,9 @@ <!-- <parameter name='tmp.ar.contrail-applied-service-instance-id' value='' /> -->
</set>
<set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/'
+ <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/contrail-route-topology/'` " />
+ + '/allotted-resource-data/contrail-route-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' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml index c49f2ebe..96fb21e2 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.parent-service-instance-id' value='`$cto-api.parent-service-instance-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/contrail-route-topology/'` " /> + + '/allotted-resource-data/contrail-route-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' /> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml index d1ef588f..2df2f0ba 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml @@ -318,9 +318,9 @@ <set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='contrail-route-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='
+ $contrail-route-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/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml index 5e1fbe7b..0f05fe56 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml @@ -22,9 +22,9 @@ </set></block></outcome></switch></for></block><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/brg-topology/'` " />
+ + '/allotted-resource-data/brg-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' />
@@ -317,9 +317,9 @@ brg-topology-operation-input.service-information.service-instance-id </return></outcome></execute><set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='brg-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='
+ $tmp.service-data.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
<!--
brg-topology-operation-input.allotted-resource-information.parent-service-instance-id
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml index 21f0efb4..a8074bda 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml @@ -5,9 +5,9 @@ </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ + '/allotted-resource-data/tunnelxconn-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' />
@@ -216,9 +216,9 @@ value="`$brg-ar-assignments.`" /> </return></outcome></execute><set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='tunnelxconn-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='
+ $brg-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/GENERIC-RESOURCE-API_brg-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml index 54c99cbf..6216a12f 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml @@ -6,9 +6,9 @@ </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/brg-topology/'` " />
+ + '/allotted-resource-data/brg-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' />
@@ -89,12 +89,12 @@ </return></outcome></execute><set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='brg-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='
+ $brg-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" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic> +</return></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml index 0fda4176..39fd9577 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml @@ -7,7 +7,7 @@ <parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />
</set>
<set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/brg-topology/'` " />
+ <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource=' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/brg-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' />
@@ -263,7 +263,7 @@ <set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='brg-object-path' value="`$tmp.ar.self-link`"/>
- <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $brg-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=' + $brg-topology-operation-input.service-information.service-instance-id + '/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/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml index 40effacd..3ecb8d94 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml @@ -6,9 +6,9 @@ </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/brg-topology/'` " />
+ + '/allotted-resource-data/brg-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' />
@@ -94,12 +94,12 @@ </return></outcome></execute><set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='brg-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='
+ $brg-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" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic> +</return></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml index 0a01dd9c..bc6345d6 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml @@ -6,9 +6,9 @@ </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/brg-topology/'` " />
+ + '/allotted-resource-data/brg-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' />
@@ -70,12 +70,12 @@ </return></outcome></execute><set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='brg-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='
+ $brg-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" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic> +</return></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml index 06756c60..5a9bf1cb 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml @@ -8,9 +8,9 @@ <parameter name='tmp.ar.parent-service-instance-id' value='`$contrail-route-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
</set>
<set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/'
+ <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/contrail-route-topology/'` " />
+ + '/allotted-resource-data/contrail-route-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' />
@@ -327,9 +327,9 @@ pfx="tmp.AnAI-dest"> <set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='contrail-route-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='
+ $contrail-route-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/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml index 444b50d6..ddf35c6f 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml @@ -10,9 +10,9 @@ <parameter name='tmp.ar.allotted-resource-type' value='`$contrail-route-topology-operation-input.allotted-resource-information.allotted-resource-type`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/contrail-route-topology/'` " /> + + '/allotted-resource-data/contrail-route-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' /> @@ -967,9 +967,9 @@ value="`$ar-assignments.`" /> <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='contrail-route-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=' + $contrail-route-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/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml index 2f3c907b..d46bf71a 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml @@ -8,9 +8,9 @@ <parameter name='tmp.ar.parent-service-instance-id' value='`$contrail-route-topology-operation-input.allotted-resource-information.parent-service-instance-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/contrail-route-topology/'` " /> + + '/allotted-resource-data/contrail-route-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' /> @@ -366,9 +366,9 @@ <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='contrail-route-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=' + $contrail-route-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/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml index 5fc21d2d..2619f5ed 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.sz-vnf-id' value='`$contrail-route-topology-operation-input.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-vnf-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/contrail-route-topology/'` " /> + + '/allotted-resource-data/contrail-route-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' /> @@ -295,9 +295,9 @@ <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='contrail-route-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=' + $contrail-route-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/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml index c57b5f9a..90b1ed4f 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.sz-vnf-id' value='`$contrail-route-topology-operation-input.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-vnf-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/contrail-route-topology/'` " /> + + '/allotted-resource-data/contrail-route-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' /> @@ -244,9 +244,9 @@ <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='contrail-route-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=' + $contrail-route-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/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml index e4cbfc27..19934c45 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml @@ -8,9 +8,9 @@ <parameter name='tmp.ar.parent-service-instance-id' value='`$contrail-route-topology-operation-input.allotted-resource-information.parent-service-instance-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/contrail-route-topology/'` " /> + + '/allotted-resource-data/contrail-route-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' /> @@ -324,9 +324,9 @@ </switch> <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-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=' + $contrail-route-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/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml index 411cbb38..927efbd4 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml @@ -453,7 +453,7 @@ </set>
<set>
<parameter name="networkId" value="`$prop.dci.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.dci.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.dci.network-id + '/network-data?content=config'` " />
</set>
</block>
</block>
@@ -464,7 +464,7 @@ <parameter name="orchestration-status" value="Created" />
<parameter name="operational-status" value="Created" />
<parameter name="model-customization-id" value="`$prop.dci.network-id`" />
- <parameter name="configuration-selflink" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.dci.network-id + '/network-data/'` " />
+ <parameter name="configuration-selflink" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.dci.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 AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type" force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="configuration" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml index d70691bc..3adebf53 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml @@ -201,7 +201,7 @@ </switch>
<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>
<return status="success">
<parameter name="ack-final-indicator" value="Y" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml index 5db9776a..4eb7c266 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml @@ -114,10 +114,10 @@ <parameter name='service-data.provided-configurations.provided-configuration[$pc-index].configuration-sub-type'
value='`$generic-configuration-notification-input.configuration-information.configuration-sub-type`' />
<parameter name='service-data.provided-configurations.provided-configuration[$pc-index].configuration-topology-link'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $generic-configuration-notification-input.service-information.service-instance-id
- + '/service-data/provided-configurations/provided-configuration/'
- + $generic-configuration-notification-input.configuration-information.configuration-id`" />
+ + '/service-data/provided-configurations/provided-configuration='
+ + $generic-configuration-notification-input.configuration-information.configuration-id +'?content=config'`" />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$prop.restapi.vnf-sub-interface-group`"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml index 56f0d74b..7143a064 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml @@ -73,7 +73,7 @@ </switch>
<set>
<parameter name='notification-url'
- value="`$prop.controller.url + '/restconf/operations/GENERIC-RESOURCE-API:generic-configuration-notification'`" />
+ value="`$prop.controller.url + '/rests/operations/GENERIC-RESOURCE-API:generic-configuration-notification'`" />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$prop.bondingservice.server + $prop.bondingservice.uri`"/>
@@ -100,9 +100,9 @@ </execute>
<set>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $service-data.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
<parameter name='filename' value='/var/tmp/bgb-genconfig.log' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml index 76b8df45..19d6df0e 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml @@ -527,12 +527,12 @@ key="forwarding-path.forwarding-path-id = $forwarding-path.service-paths.service-path[$sp-index].service-path-instance-id" >
<parameter name="forwarding-path-id" value="`$forwarding-path.service-paths.service-path[$sp-index].service-path-instance-id`" />
<parameter name="forwarding-path-name" value="`$forwarding-path.service-paths.service-path[$sp-index].service-path-instance-name`" />
- <parameter name="selflink" value="`'/restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name="selflink" value="`'/rests/data/GENERIC-RESOURCE-API:services/service='
+ $output-service-instance-id
- + '/forwarding-paths/forwarding-path/'
+ + '/forwarding-paths/forwarding-path='
+ $forwarding-path.forwarding-path-id
- + '/services-paths/service-path/'
- + $forwarding-path.service-paths.service-path[$sp-index].service-path-instance-id`" />
+ + '/services-paths/service-path='
+ + $forwarding-path.service-paths.service-path[$sp-index].service-path-instance-id`+'?content=config'" />
<outcome value='failure'>
<set>
<parameter name='error-message' value="Failure writing forwarding-path to AAI" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml index 71d3c779..4da84e50 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml @@ -391,12 +391,12 @@ key="INSERT INTO SERVICE_INSTANCE_TO_COMPOSITE_INSTANCE_MAPPING key="forwarding-path.forwarding-path-id = $forwarding-path.service-paths.service-path[0].service-path-instance-id" >
<parameter name="forwarding-path-id" value="`$forwarding-path.service-paths.service-path[0].service-path-instance-id`" />
<parameter name="forwarding-path-name" value="`$forwarding-path.service-paths.service-path[0].service-path-instance-name`" />
- <parameter name="selflink" value="`'/restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name="selflink" value="`'/rests/data/GENERIC-RESOURCE-API:services/service='
+ $tmp.service-instance-id
- + '/forwarding-paths/forwarding-path/'
+ + '/forwarding-paths/forwarding-path='
+ $forwarding-path.forwarding-path-id
- + '/services-paths/service-path/'
- + $forwarding-path.service-paths.service-path[0].service-path-instance-id`" />
+ + '/services-paths/service-path='
+ + $forwarding-path.service-paths.service-path[0].service-path-instance-id+'?content=config'`" />
<outcome value='failure'>
<set>
<parameter name='error-message' value="Failure writing forwarding-path to AAI" />
@@ -648,12 +648,12 @@ key="INSERT INTO SERVICE_INSTANCE_TO_COMPOSITE_INSTANCE_MAPPING key="forwarding-path.forwarding-path-id = $forwarding-path.service-paths.service-path[0].service-path-instance-id" >
<parameter name="forwarding-path-id" value="`$forwarding-path.service-paths.service-path[0].service-path-instance-id`" />
<parameter name="forwarding-path-name" value="`$forwarding-path.service-paths.service-path[0].service-path-instance-name`" />
- <parameter name="selflink" value="`'/restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name="selflink" value="`'/rests/data/GENERIC-RESOURCE-API:services/service='
+ $tmp.service-instance-id
- + '/forwarding-paths/forwarding-path/'
+ + '/forwarding-paths/forwarding-path='
+ $forwarding-path.forwarding-path-id
- + '/services-paths/service-path/'
- + $forwarding-path.service-paths.service-path[0].service-path-instance-id`" />
+ + '/services-paths/service-path='
+ + $forwarding-path.service-paths.service-path[0].service-path-instance-id + '?content=config'`" />
<outcome value='failure'>
<set>
<parameter name='error-message' value="Failure writing forwarding-path to AAI" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml index f7384186..4e1ac123 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml @@ -87,13 +87,13 @@ service-data.service-topology.service-topology-identifier.service-instance-id <parameter name='tmp.restapi.service.vnf.vfmodule-resource' value='`$prop.restapi.service.vnf.vfmodule-resource`' />
</set><set>
<parameter name='tmp.vf-module-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $service-data.service-topology.service-topology-identifier.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='
+ $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id
- + '/'`"/>
+ + '?content=config'`"/>
</set><set>
<!--
<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-activate.xml index ed5130a3..68117f8f 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-activate.xml @@ -185,11 +185,11 @@ <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
</set>
<set>
- <parameter name='network-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <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/'
+ + '/service-data/networks/network='
+ $networkId
- + '/network-data/network-topology/'` " />
+ + '/network-data/network-topology?content=config'` " />
</set>
<set>
<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Created' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml index 4de5c5fd..de2b4ec4 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml @@ -182,11 +182,11 @@ <parameter name='tmp.l3-network.eipam-v6-address-plan' value="`$network-model.eipam-v6-address-plan`" />
<parameter name='tmp.l3-network.eipam-v4-address-plan' value="`$network-model.eipam-v4-address-plan`" />
<parameter name='tmp.l3-network.service-id' value="`$service-data.service-information.service-id`" />
- <parameter name='tmp.l3-network.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='tmp.l3-network.self-link' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $network-topology-operation-input.service-information.service-instance-id
- + '/service-data/networks/network/'
+ + '/service-data/networks/network='
+ $tmp.l3-network.network-id
- + '/network-data/network-topology/'` " />
+ + '/network-data/network-topology?content=config'` " />
</set>
<switch test='`$network-model.is-provider-network`'>
<outcome value='Y'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml index b0eb3f63..5aba9547 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml @@ -108,11 +108,11 @@ <parameter name='tmp.l3-network.eipam-v6-address-plan' value="`$network-model.eipam-v6-address-plan`" />
<parameter name='tmp.l3-network.eipam-v4-address-plan' value="`$network-model.eipam-v4-address-plan`" />
<parameter name='tmp.l3-network.service-id' value="`$service-data.service-information.service-id`" />
- <parameter name='tmp.l3-network.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='tmp.l3-network.self-link' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $service-data.service-information.service-instance-id
- + '/service-data/networks/network/'
+ + '/service-data/networks/network='
+ $tmp.l3-network.network-id
- + '/network-data/network-topology/'` " />
+ + '/network-data/network-topology?content=config'` " />
</set>
<set>
<parameter name="service-data.networks.network[$nidx].network-data.network-information.network-id" value='`$tmp.l3-network.network-id`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml index 56c9f6a5..3af4dd02 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml @@ -142,11 +142,11 @@ <parameter name='tmp.l3-network.eipam-v6-address-plan' value="`$network-model.eipam-v6-address-plan`" />
<parameter name='tmp.l3-network.eipam-v4-address-plan' value="`$network-model.eipam-v4-address-plan`" />
<parameter name='tmp.l3-network.service-id' value="`$service-data.service-information.service-id`" />
- <parameter name='tmp.l3-network.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <parameter name='tmp.l3-network.self-link' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $network-topology-operation-input.service-information.service-instance-id
- + '/service-data/networks/network/'
+ + '/service-data/networks/network='
+ $tmp.l3-network.network-id
- + '/network-data/network-topology/'` " />
+ + '/network-data/network-topology?content=config'` " />
</set>
<switch test='`$network-model.is-provider-network`'>
<outcome value='Y'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml index b3e2b210..a4f0fdad 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml @@ -533,7 +533,7 @@ </set>
<set>
<parameter name="networkId" value="`$prop.l3vpn.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.l3vpn.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.l3vpn.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" />
@@ -547,7 +547,7 @@ <parameter name="orchestration-status" value="Created" />
<parameter name="operational-status" value="Created" />
<parameter name="model-customization-id" value="`$prop.l3vpn.network-id`" />
- <parameter name="configuration-selflink" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.l3vpn.network-id + '/network-data/'` " />
+ <parameter name="configuration-selflink" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.l3vpn.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 AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type" force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="configuration" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml index 54c8a750..8c7514ca 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml @@ -151,11 +151,11 @@ <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
</set>
<set>
- <parameter name='network-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ <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/'
+ + '/service-data/networks/network='
+ $networkId
- + '/network-data/network-topology/'` " />
+ + '/network-data/network-topology?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/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml index 06240451..77bf6fe1 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml @@ -288,7 +288,7 @@ </switch>
<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>
<return status="success">
<parameter name="ack-final-indicator" value="Y" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml index edb55570..7deffc63 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml @@ -1867,8 +1867,8 @@ force="true" pfx="tmp.AnAI-data">
<parameter name="configuration-name" value="`$tmp.configuration-name`" />
<parameter name="operational-status" value="out-of-service-path" />
- <parameter name="configuration-selflink" value="`'/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/'
- + $port-mirror-topology-operation-input.configuration-information.configuration-id + '/configuration-data/port-mirror-configuration-topology'`" />
+ <parameter name="configuration-selflink" value="`'/rests/data/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration='
+ + $port-mirror-topology-operation-input.configuration-information.configuration-id + '/configuration-data/port-mirror-configuration-topology?content=config'`" />
<outcome value='not-found'>
<block atomic="true">
<set>
@@ -2093,7 +2093,7 @@ <parameter name='service-data.provided-configurations.provided-configuration[$tmp.provided-conf-idx].configuration-sub-type'
value='`$port-mirror-topology-operation-input.configuration-information.configuration-sub-type`' />
<parameter name='service-data.provided-configurations.provided-configuration[$tmp.provided-conf-idx].configuration-topology-link'
- value="`'restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/' + $tmp.configuration-id + '/configuration-data/port-mirror-configuration-topology'`" />
+ value="`'rests/data/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration=' + $tmp.configuration-id + '/configuration-data/port-mirror-configuration-topology?content=config'`" />
</set>
<set>
<parameter name='pm.configuration-data.configuration-oper-status.order-status'
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml index fb3cdb2e..814be029 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml @@ -79,10 +79,10 @@ </outcome> </switch> <set> - <parameter name='service-object-path' value="`'/config/GENERIC-RESOURCE-API:services/service/' + <parameter name='service-object-path' value="`'/rests/data/GENERIC-RESOURCE-API:services/service=' + $port-mirror-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology'`" /> - <parameter name='port-mirror-object-path' value="`'/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/' - + $port-mirror-topology-operation-input.configuration-information.configuration-id + '/configuration-data/port-mirror-configuration-topology'`" /> + <parameter name='port-mirror-object-path' value="`'/rests/data/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration=' + + $port-mirror-topology-operation-input.configuration-information.configuration-id + '/configuration-data/port-mirror-configuration-topology?content=config'`" /> </set> <return status='success'></return> </block> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml index f49173a6..e5584e60 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.sz-vnf-id' value='`$security-zone-topology-operation-input.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-vnf-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/security-zone-topology/'` " /> + + '/allotted-resource-data/security-zone-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' /> @@ -136,9 +136,9 @@ <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='security-zone-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=' + $security-zone-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/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml index cb8450bf..14252ade 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.sz-vnf-id' value='`$security-zone-topology-operation-input.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-vnf-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/security-zone-topology/'` " /> + + '/allotted-resource-data/security-zone-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' /> @@ -334,9 +334,9 @@ value="`$sz-ar-assignments.`" /> <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='security-zone-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=' + $security-zone-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/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml index a234d0d8..a5a05012 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.sz-vnf-id' value='`$security-zone-topology-operation-input.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-vnf-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/security-zone-topology/'` " /> + + '/allotted-resource-data/security-zone-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' /> @@ -113,9 +113,9 @@ <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='security-zone-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=' + $security-zone-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/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml index 14ecf296..1f9bd417 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.sz-vnf-id' value='`$security-zone-topology-operation-input.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-vnf-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/security-zone-topology/'` " /> + + '/allotted-resource-data/security-zone-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' /> @@ -136,9 +136,9 @@ <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='security-zone-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=' + $security-zone-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/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml index acad449d..f3153fb8 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.sz-vnf-id' value='`$security-zone-topology-operation-input.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-vnf-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/security-zone-topology/'` " /> + + '/allotted-resource-data/security-zone-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' /> @@ -116,9 +116,9 @@ <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='security-zone-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=' + $security-zone-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/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml index 0f11b39c..7cb23e65 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml @@ -9,9 +9,9 @@ <parameter name='tmp.ar.sz-vnf-id' value='`$security-zone-topology-operation-input.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-vnf-id`' /> </set> <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/' + <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource=' + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/security-zone-topology/'` " /> + + '/allotted-resource-data/security-zone-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' /> @@ -91,9 +91,9 @@ <set> <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> <parameter name='security-zone-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=' + $security-zone-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/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml index 6631d89e..3a21c341 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml @@ -92,11 +92,11 @@ </get-resource>
<set>
<parameter name="ss.selflink"
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' +
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service=' +
$service-data.pnfs.pnf[$pnf-index].pnf-data.service-information.service-instance-id +
- '/service-data/pnfs/pnf/' +
+ '/service-data/pnfs/pnf=' +
$ss.param.pnf-id +
- '/pnf-data/pnf-topology/'`" />
+ '/pnf-data/pnf-topology?content=config'`" />
</set>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="pnf"
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml index c64485bc..ebe5693d 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml @@ -1305,13 +1305,13 @@ </outcome>
</get-resource>
<set>
- <parameter name='ss.selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' +
+ <parameter name='ss.selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' +
$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id +
-'/service-data/vnfs/vnf/' +
+'/service-data/vnfs/vnf=' +
$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id +
-'/vnf-data/vf-modules/vf-module/' +
+'/vnf-data/vf-modules/vf-module=' +
$ss.param.vf-module-id +
-'/vf-module-data/vf-module-topology/'`" />
+'/vf-module-data/vf-module-topology?content=config'`" />
</set>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="vf-module"
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml index 877c272d..35604e01 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml @@ -98,11 +98,11 @@ </get-resource>
<set>
<parameter name="ss.selflink"
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' +
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service=' +
$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id +
- '/service-data/vnfs/vnf/' +
+ '/service-data/vnfs/vnf=' +
$ss.param.vnf-id +
- '/vnf-data/vnf-topology/'`" />
+ '/vnf-data/vnf-topology?content=config'`" />
</set>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml index c9300bd1..178dc0d8 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml @@ -142,9 +142,9 @@ </switch>
<set>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $service-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="service-instance"
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml index c018b1ab..6d083858 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml @@ -53,9 +53,9 @@ </set>
<set>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $service-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<return status='success'></return>
</block>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml index 4d75a2fb..36a3c8de 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml @@ -6,9 +6,9 @@ </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ + '/allotted-resource-data/tunnelxconn-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' />
@@ -122,9 +122,9 @@ $tunnelxconn-topology-operation-input.service-information.subscription-service-t </return></outcome></execute><set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='tunnelxconn-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='
+ $tunnelxconn-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/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml index 58f73f89..639857e6 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml @@ -6,9 +6,9 @@ </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ + '/allotted-resource-data/tunnelxconn-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' />
@@ -255,9 +255,9 @@ value="`$tx-ar-assignments.`" /> </return></outcome></execute><set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='tunnelxconn-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='
+ $tunnelxconn-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/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml index 8071065a..ad53d8ea 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml @@ -6,7 +6,7 @@ <parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
</set>
<set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource=' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/tunnelxconn-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' />
@@ -288,7 +288,7 @@ <set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
- <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $tunnelxconn-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=' + $tunnelxconn-topology-operation-input.service-information.service-instance-id + '/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/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml index dc24e034..ecce0179 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml @@ -5,9 +5,9 @@ </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ + '/allotted-resource-data/tunnelxconn-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' />
@@ -106,12 +106,12 @@ </return></outcome></execute><set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='tunnelxconn-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='
+ $tunnelxconn-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" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic> +</return></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml index d70fb608..a86f7270 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml @@ -6,7 +6,7 @@ <parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
</set>
<set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ <parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource=' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/tunnelxconn-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' />
@@ -256,7 +256,7 @@ <set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
- <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $tunnelxconn-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=' + $tunnelxconn-topology-operation-input.service-information.service-instance-id + '/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/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml index eaab7f29..2fe93db1 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml @@ -5,9 +5,9 @@ </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource='
+ $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ + '/allotted-resource-data/tunnelxconn-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' />
@@ -69,12 +69,12 @@ </return></outcome></execute><set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='tunnelxconn-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='
+ $tunnelxconn-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" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic> +</return></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml index 081a4e3b..51d42bf4 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml @@ -797,23 +797,23 @@ </for>
<set>
<parameter name='vf-module-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/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>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="vf-module"
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml index 9d1f3ca5..1619b313 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml @@ -638,23 +638,23 @@ </for>
<set>
<parameter name='vf-module-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/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>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="vf-module"
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml index acb3c1ce..863ee2cc 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml @@ -1324,15 +1324,15 @@ </for>
<set>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vnf-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='
+ $vnf-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="generic-vnf"
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml index 2202daca..a55a496c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml @@ -1117,15 +1117,15 @@ </for>
<set>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $vnf-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='
+ $vnf-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="generic-vnf"
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml index a45713f5..0bf3f706 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml @@ -102,9 +102,9 @@ </set>
<set>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='
+ $service-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
</set>
<return status='success'></return>
</block>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-delete.xml index 9c24e525..7f720da6 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-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/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml index 9cb132d1..14eac35c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml @@ -228,7 +228,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />--> <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />--> <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />--> - <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.network-id + '/network-data?content=config'` " /> </save> <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' @@ -557,7 +557,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />--> <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />--> <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />--> - <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.network-id + '/network-data?content=config'` " /> </save> <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml index f4a46c8e..844eec50 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml @@ -996,7 +996,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
- <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1064,7 +1064,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
- <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1160,7 +1160,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
- <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1223,7 +1223,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
- <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1477,7 +1477,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
- <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml index d9000d0b..c41104c3 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml @@ -981,7 +981,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />--> <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />--> <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />--> - <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id @@ -1049,7 +1049,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />--> <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />--> <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />--> - <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id @@ -1145,7 +1145,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />--> <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />--> <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />--> - <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id @@ -1208,7 +1208,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />--> <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />--> <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />--> - <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id @@ -1831,7 +1831,7 @@ <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />--> <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />--> <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />--> - <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id diff --git a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.xml b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.xml index a07cee26..155b5ae2 100644 --- a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.xml @@ -390,7 +390,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id @@ -667,7 +667,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id @@ -1004,7 +1004,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id 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"
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml index 3e3b395c..152ff15c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml @@ -8,9 +8,9 @@ <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
</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' />
@@ -87,7 +87,7 @@ <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
</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`"/>
@@ -632,9 +632,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/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml index ff7640d7..b623c76c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-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'
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/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml index 9a334655..03d308f4 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-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`"/>
@@ -423,9 +423,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/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml index 3104c685..f56df7aa 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-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/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml index bee22722..2d01b48c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml @@ -22,7 +22,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/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml index af67bd68..96769150 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml @@ -158,7 +158,7 @@ </set> <set> <parameter name='networkId' value='`$prop.sotn.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.sotn.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.sotn.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' /> @@ -187,7 +187,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " /> + <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml index 53dae268..2e1ac4d2 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml @@ -22,7 +22,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/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml index 2eb6e767..88c6ecf8 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml @@ -20,9 +20,9 @@ </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/'` " />
+ + '/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/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml index 1f3e0f7f..f27a087d 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml @@ -5,9 +5,9 @@ <block atomic="true">
<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'` " />-->
<parameter name='vnfId' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vf-module-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` " />
+ <parameter name="vnf-object-path" value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf=' + $vf-module-topology-operation-input.vnf-information.vnf-id + '/vnf-data?content=config'` " />
</set>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="connectivity"
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml index 98ca621f..c871e4ba 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml @@ -84,23 +84,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' />
@@ -117,7 +117,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 = $vf-module-topology-operation-input.vnf-information.vnf-id'
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-deactivate.xml index 20b28f29..6367376c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-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/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.xml index 8585db55..fae76a53 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-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="connectivity"
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml index 9648bb69..78e1c5a2 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml @@ -67,23 +67,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'`"/>
<!--+ $vf-module-topology-operation-input.vf-module-information.vf-module-id-->
</set>
<set>
@@ -100,7 +100,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/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml index 3210405e..1b608ed3 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-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/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml index 07ba2028..b03b58a5 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-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/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.xml index 139f12e8..a7ebc0be 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-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/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.xml index 130eee23..47ce6181 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-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"
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml index 8e743ff6..b81b4b7b 100644 --- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml @@ -389,7 +389,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
@@ -645,7 +645,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1014,7 +1014,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml index bc0505d4..e4b33ad7 100644 --- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml +++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml @@ -503,7 +503,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
@@ -759,7 +759,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1123,7 +1123,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='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ <parameter name='connectivity-selflink' value="`'rests/data/GENERIC-RESOURCE-API:services/service=' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network=' + $prop.sotn.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 = $vnf-topology-operation-input.service-information.service-instance-id
|