diff options
| author |   Marcus Williams <marcus.williams@intel.com> | 2017-11-15 20:32:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-15 20:32:25 +0000 |
| commit | b44ef7d04e30fbcf24300e46eb33571369981384 (patch) | |
| tree | e82b21eb978a996bb184ecc3392b6ec885841588 /platform-logic/generic-resource-api/src/main/json | |
| parent | ff9bbad4bde78468e40f8433972d4964a5fbd72f (diff) | |
| parent | 8bf2d072d8e7935b9e55658a2a03d5155feab773 (diff) | |
Merge "fix AAI storage problem"
Former-commit-id: 123499c4e0c7996e2f01d1780b310706f2001f75
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/json')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json index 5f91a3d2..5bba62e6 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json @@ -1897,7 +1897,7 @@ "id": "3620f5be.990eda", "type": "save", "name": "save overlay configuration in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n key='configuration.configuration-id = $prop.dci.network-id' >\n<parameter name='configuration-id' value='`$prop.dci.network-id`' />\n<parameter name='configuration-type' value='overlay' />\n<parameter name='orchestration-status' value='Created' />\n<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/'` \" />\n", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n key='configuration.configuration-id = $prop.dci.network-id' >\n<parameter name='configuration-id' value='`$prop.dci.network-id`' />\n<parameter name='configuration-type' value='overlay' />\n<parameter name='configuration-sub-type' value='VPN-DCI' />\n<parameter name='orchestration-status' value='Created' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$prop.dci.network-id`' />\n<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/'` \" />\n", "comments": "", "outputs": 1, "x": 845.53125, @@ -1911,7 +1911,7 @@ "id": "2b8696d6.909b7a", "type": "save", "name": "save service relationship in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-id' >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"/network/configurations/configuration\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.dci.network-id`\" />", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/configurations/configuration/' + $prop.dci.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.dci.network-id`\" />", "comments": "", "outputs": 1, "x": 803.5312805175781, |