diff options
| author |   Benjamin, Max (mb388a) <mb388a@us.att.com> | 2019-03-14 16:02:18 -0400 |
|---|---|---|
| committer | Benjamin, Max (mb388a) <mb388a@us.att.com> | 2019-03-14 16:03:06 -0400 |
| commit | 0b906b0de95725879fd1cc7ad585d71c502eebd9 (patch) | |
| tree | 40a19fd268fe177e806afa69771b61a308046266 /mso-catalog-db/src/main/java | |
| parent | ff8c5e9f78b46f29c08576393438e902ea6d8cd6 (diff) | |
Added vnfc support to BB layer
added vnfc to gbb for execute bb and bb layer
enhance workflow action layer to handle vnfcs
Change-Id: I0d39c3aefe66180ed6f2b75a0c946e07ca603261
Issue-ID: SO-1658
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'mso-catalog-db/src/main/java')
| -rw-r--r-- | mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java index 9b888cb2ed..f73044747c 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java @@ -75,6 +75,7 @@ public class CatalogDbClient { private static final String CLOUD_SITE = "/cloudSite"; private static final String CLOUDIFY_MANAGER = "/cloudifyManager"; + private static final String CVNFC_CUSTOMZIATION = "/cvnfcCustomization"; private static final String RAINY_DAY_HANDLER_MACRO = "/rainy_day_handler_macro"; private static final String NORTHBOUND_REQUEST_REF_LOOKUP = "/northbound_request_ref_lookup"; private static final String NETWORK_RESOURCE_CUSTOMIZATION = "/networkResourceCustomization"; @@ -177,6 +178,7 @@ public class CatalogDbClient { private String cloudifyManagerURI; private String cloudSiteURI; private String homingInstanceURI; + private String cvnfcResourceCustomizationURI; private String pnfResourceURI; private String pnfResourceCustomizationURI; @@ -238,10 +240,10 @@ public class CatalogDbClient { private final Client<PnfResourceCustomization> pnfResourceCustomizationClient; - @Value("${mso.catalog.db.spring.endpoint}") + @Value("${mso.catalog.db.spring.endpoint:#{null}}") private String endpoint; - @Value("${mso.db.auth}") + @Value("${mso.db.auth:#{null}}") private String msoAdaptersAuth; @@ -305,6 +307,7 @@ public class CatalogDbClient { networkCollectionResourceCustomizationURI = endpoint + NETWORK_COLLECTION_RESOURCE_CUSTOMIZATION + URI_SEPARATOR; networkResourceCustomizationURI = endpoint + NETWORK_RESOURCE_CUSTOMIZATION + URI_SEPARATOR; + cvnfcResourceCustomizationURI = endpoint + CVNFC_CUSTOMZIATION + URI_SEPARATOR; vnfResourceCustomizationURI = endpoint + VNF_RESOURCE_CUSTOMIZATION + URI_SEPARATOR; collectionNetworkResourceCustomizationURI = endpoint + COLLECTION_NETWORK_RESOURCE_CUSTOMIZATION + URI_SEPARATOR; @@ -518,6 +521,15 @@ public class CatalogDbClient { return networkResourceCustomization; } + public CvnfcCustomization getCvnfcCustomizationByModelCustomizationUUID(String modelCustomizationUUID){ + CvnfcCustomization cvnfcResourceCustomization = + this.getSingleResource(cvnfcCustomizationClient, getUri(cvnfcResourceCustomizationURI + modelCustomizationUUID)); + if (cvnfcResourceCustomization != null) { + cvnfcResourceCustomization.setModelCustomizationUUID(modelCustomizationUUID); + } + return cvnfcResourceCustomization; + } + public BuildingBlockDetail getBuildingBlockDetail(String buildingBlockName) { BuildingBlockDetail buildingBlockDetail = getSingleResource(buildingBlockDetailClient, getUri(UriBuilder .fromUri(findOneByBuildingBlockName).queryParam(BUILDING_BLOCK_NAME, buildingBlockName).build() |