diff options
Diffstat (limited to 'csit')
6 files changed, 24 insertions, 24 deletions
diff --git a/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml b/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml index f9b5960c..426009d5 100644 --- a/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml +++ b/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml @@ -96,11 +96,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/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_service-topology-operation-assign.xml b/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_service-topology-operation-assign.xml index 300c1a92..b5986702 100644 --- a/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_service-topology-operation-assign.xml +++ b/csit/plans/sdnc/testdata/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>
<set>
<parameter name='service-data.service-topology.service-topology-identifier.service-instance-id'
diff --git a/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml b/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml index fa6271a4..a938fd3b 100644 --- a/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml +++ b/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml @@ -599,23 +599,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>
<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-vlan-tagging-assign' mode='sync' >
<outcome value='failure'>
@@ -702,4 +702,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id </switch>
</block>
</method>
-</service-logic> +</service-logic>
diff --git a/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml b/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml index 2ad5a468..4ff0378b 100644 --- a/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml +++ b/csit/plans/sdnc/testdata/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml @@ -814,15 +814,15 @@ </set>
<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>
<for silentFailure='true' index='inst-group-index' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids_length`' >
<block atomic="true">
diff --git a/csit/scripts/aaisimulator/aaiclient.properties b/csit/scripts/aaisimulator/aaiclient.properties index 74b5e567..453fd21e 100755 --- a/csit/scripts/aaisimulator/aaiclient.properties +++ b/csit/scripts/aaisimulator/aaiclient.properties @@ -54,8 +54,8 @@ org.onap.ccsdk.sli.adaptors.aai.update=/aai/v13/actions/update # UBB Notify org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v13/actions/notify -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/rests/data/L3SDN-API:services/layer3-service-list={service-instance-id}?content=config +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/rests/data/L3AVPN-EVC-API:services/service-list={service-instance-id}/service-data/avpn-logicalchannel-information?content=config # P-Interfaces org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v13/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces diff --git a/csit/scripts/aaisimulator/wiremock/mappings/aai.json b/csit/scripts/aaisimulator/wiremock/mappings/aai.json index 64739068..e63f7834 100755 --- a/csit/scripts/aaisimulator/wiremock/mappings/aai.json +++ b/csit/scripts/aaisimulator/wiremock/mappings/aai.json @@ -14,7 +14,7 @@ "environment-context": "General_Revenue-Bearing",
"workload-context": "Testing",
"resource-version": "1616417209896",
- "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca/service-data/service-topology/",
+ "selflink": "rests/data/GENERIC-RESOURCE-API:services/service=5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca/service-data/service-topology?content=config",
"orchestration-status": "Inventoried"
}
}
@@ -25,7 +25,7 @@ "url": "/aai/v24/business/customers/customer/testsvc1/service-subscriptions/service-subscription/test/service-instances/service-instance/5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca?resource-version=1616417209896",
"bodyPatterns": [{
"equalToJson": {
- "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca/service-data/service-topology/",
+ "selflink": "rests/data/GENERIC-RESOURCE-API:services/service=5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca/service-data/service-topology?content=config",
"resource-version": "1616417209896",
"service-instance-name": "zrdm61asmsf01_svc"
},
|