diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-09-24 10:39:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-24 10:39:48 +0000 |
| commit | bbc6dd03b17fc5cdb2305a281f94835e1d9d9929 (patch) | |
| tree | 242184572cdafc94b1888e0d1e3b18b1fe30cbed /vid-app-common/src/main/java/org/onap | |
| parent | 61d60cacd54706760a633cd058cce1c8b15e6da4 (diff) | |
| parent | 2d65dade2ac365b1baf9926b8d3de9c378a6f528 (diff) | |
Merge "Encoding path segments on reduced custom query"
Diffstat (limited to 'vid-app-common/src/main/java/org/onap')
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java index 644309d95..7e96c93cd 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java @@ -315,13 +315,13 @@ public class AaiClient implements AaiClientInterface { if (cloudRegion != null){ return ImmutableMap.of( "start", ImmutableList - .of("/business/customers/customer/" + subscriberId + "/service-subscriptions/service-subscription/" + serviceType + "/service-instances"), + .of("/business/customers/customer/" + encodePathSegment(subscriberId) + "/service-subscriptions/service-subscription/" + encodePathSegment(serviceType) + "/service-instances"), "query", "query/vnfs-fromServiceInstance-filterByCloudRegion?nfRole=" + nfRole + "&cloudRegionID=" + cloudRegion + "" ); }else { return ImmutableMap.of( "start", ImmutableList - .of("/business/customers/customer/" + subscriberId + "/service-subscriptions/service-subscription/" + serviceType + "/service-instances"), + .of("/business/customers/customer/" + encodePathSegment(subscriberId) + "/service-subscriptions/service-subscription/" + encodePathSegment(serviceType) + "/service-instances"), "query", "query/vnfs-fromServiceInstance-filter?nfRole=" + nfRole + "" ); } @@ -330,14 +330,14 @@ public class AaiClient implements AaiClientInterface { if (cloudRegion != null){ return ImmutableMap.of( "start", ImmutableList - .of("/business/customers/customer/" + subscriberId + "/service-subscriptions/service-subscription/" + serviceType + "/service-instances"), + .of("/business/customers/customer/" + encodePathSegment(subscriberId) + "/service-subscriptions/service-subscription/" + encodePathSegment(serviceType) + "/service-instances"), "query", "query/vnfs-fromServiceInstance-filterByCloudRegion?cloudRegionID=" + cloudRegion + "" ); } return ImmutableMap.of( "start", ImmutableList - .of("/business/customers/customer/" + subscriberId + "/service-subscriptions/service-subscription/" + serviceType + "/service-instances"), + .of("/business/customers/customer/" + encodePathSegment(subscriberId) + "/service-subscriptions/service-subscription/" + encodePathSegment(serviceType) + "/service-instances"), "query", "query/vnfs-fromServiceInstance-filter" ); } |