diff options
| author |   jimmydot <jf2512@att.com> | 2017-06-08 11:54:45 -0400 |
|---|---|---|
| committer | jimmydot <jf2512@att.com> | 2017-06-08 11:54:45 -0400 |
| commit | 36c86ad506206ed1a038f1129b1bde37efa0eaaa (patch) | |
| tree | 388292dca8ad2812be23413cedba4f6f5b4cee3a /vid-app-common/src/main/java/org/openecomp/vid/model | |
| parent | 6c7dcba5be04a502a2d5de7e7c5f14eedf9eaa2a (diff) | |
[VID-15] fixes for various issues
Change-Id: I392a0427078d337a5d501a813dff73c1959481e2
Signed-off-by: jimmydot <jf2512@att.com>
Diffstat (limited to 'vid-app-common/src/main/java/org/openecomp/vid/model')
| -rwxr-xr-x | vid-app-common/src/main/java/org/openecomp/vid/model/ModelConstants.java | 2 | ||||
| -rwxr-xr-x | vid-app-common/src/main/java/org/openecomp/vid/model/ServiceModel.java | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/ModelConstants.java b/vid-app-common/src/main/java/org/openecomp/vid/model/ModelConstants.java index f4e42707..af5f0db9 100755 --- a/vid-app-common/src/main/java/org/openecomp/vid/model/ModelConstants.java +++ b/vid-app-common/src/main/java/org/openecomp/vid/model/ModelConstants.java @@ -31,7 +31,7 @@ public class ModelConstants { public static final String ASDC_SVC_API_PATH = "sdc.svc.api.path";
public static final String ASDC_RESOURCE_API_PATH = "sdc.resource.api.path";
- public static final String DEFAULT_ASDC_MODEL_NAMESPACE = "org.onap.";
+ public static final String DEFAULT_ASDC_MODEL_NAMESPACE = "org.openecomp.";
public static final String DEFAULT_ASDC_SVC_API_PATH = "sdc/v1/catalog/services";
public static final String DEFAULT_ASDC_RESOURCE_API_PATH = "sdc/v1/catalog/resources";
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/ServiceModel.java b/vid-app-common/src/main/java/org/openecomp/vid/model/ServiceModel.java index 140e9edf..98e65316 100755 --- a/vid-app-common/src/main/java/org/openecomp/vid/model/ServiceModel.java +++ b/vid-app-common/src/main/java/org/openecomp/vid/model/ServiceModel.java @@ -182,16 +182,15 @@ public class ServiceModel { final Map<String, VfModule> vfModules = new HashMap<String, VfModule> ();
final Map<String, VolumeGroup> volumeGroups = new HashMap<String, VolumeGroup> ();
-
- String asdcModelNamespace = VidProperties.getAsdcModelNamespace();
- String vfModuleTag = asdcModelNamespace + ModelConstants.VF_MODULE;
-
+ String asdcModelNamespaces[] = VidProperties.getAsdcModelNamespace();
+ String[] vfModuleTags = ModelUtil.getTags(asdcModelNamespaces, ModelConstants.VF_MODULE);
+
for (Entry<String, Group> component : serviceToscaModel.gettopology_template().getGroups().entrySet()) {
final Group group = component.getValue();
final String type = group.getType();
final String customizationName = component.getKey();
- if (type.startsWith(vfModuleTag)) {
+ if ( ModelUtil.isType (type, vfModuleTags) ) {
VfModule vfMod = VfModule.extractVfModule(customizationName, group);
vfModules.put(customizationName, vfMod);
if ( vfMod.isVolumeGroupAllowed() ) {
|