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/xml | |
| 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/xml')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml | 7 |
1 files changed, 5 insertions, 2 deletions
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 3afa4b93..411cbb38 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 @@ -460,12 +460,15 @@ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $prop.dci.network-id">
<parameter name="configuration-id" value="`$prop.dci.network-id`" />
<parameter name="configuration-type" value="overlay" />
+ <parameter name="configuration-sub-type" value="VPN-DCI" />
<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/'` " />
</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-id">
+ <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" />
- <parameter name="relationship-list.relationship[0].related-link" value="/network/configurations/configuration" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.dci.network-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.dci.network-id`" />
</save>
|