aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-05-10 14:55:54 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-10 14:55:54 +0000
commit9dcaef05381d552c2328b51089756b950dc4c6cd (patch)
tree180a0320b1c2764658f1eae6bb2f269fb04176f0
parent3afd9abafa26a57f9e7bba57b46c36752aac0280 (diff)
parent1562a37d9b0e5a58cb162c9480f5292ce94f866f (diff)
Merge "Add mapping for vm_type_tag"
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java13
1 files changed, 8 insertions, 5 deletions
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java
index d7ed19ea..a3345c16 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModel.java
@@ -8,9 +8,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,19 +28,22 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SdncVFCModel extends SdncBaseModel {
-
+
private static final Logger LOG = LoggerFactory
.getLogger(SdncVFCModel.class);
-
+
private String vmType = null;
private String vmCount = null;
public SdncVFCModel(ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate) {
super(sdcCsarHelper, nodeTemplate);
-
+
// extract properties
vmType = extractValue (nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VMTYPE);
+ if ((vmType == null) || (vmType.length() == 0)) {
+ vmType = extractValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VMTYPETAG);
+ }
//vmCount = extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_VMCOUNT); - need path to vm_count
vmCount = "1";
addParameter("vm_type", vmType);