[sdc] - merged 1707_build into sdc LF

Change-Id: Ia91f0206493d0cd8f158779ed1a94f55305c8a97
Signed-off-by: Idan Amit <ia096e@intl.att.com>
Signed-off-by: Michael Lando <ml636r@att.com>

2 files changed, 9 insertions, 8 deletions

diff --git a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java
index 192f6759c3..6bf0786a4b 100644
--- a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java
+++ b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java
@@ -49,6 +49,7 @@ import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstInputsMap;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.ComponentInstanceInput;
+import org.openecomp.sdc.be.model.ComponentInstancePropInput;
 import org.openecomp.sdc.be.model.ComponentInstanceProperty;
 import org.openecomp.sdc.be.model.GroupDefinition;
 import org.openecomp.sdc.be.model.GroupProperty;
@@ -472,10 +473,10 @@ public class ExportToscaTest extends ComponentBaseTest {
 		// 6 add instance inputs in service
 		RestResponse getComponentInstanceInputsResponse = InputsRestUtils.getComponentInstanceInputs(service, vfi);
 		BaseValidationUtils.checkSuccess(getComponentInstanceInputsResponse);
-		List<InputDefinition> instanceInputs = new Gson().fromJson(getComponentInstanceInputsResponse.getResponse(), new TypeToken<ArrayList<InputDefinition>>() {
+		List<ComponentInstancePropInput> instanceInputs = new Gson().fromJson(getComponentInstanceInputsResponse.getResponse(), new TypeToken<ArrayList<ComponentInstancePropInput>>() {
 		}.getType());
 		// Take only the 2 first inputs
-		List<InputDefinition> inputsToAdd = instanceInputs.stream().limit(2).collect(Collectors.toList());
+		List<ComponentInstancePropInput> inputsToAdd = instanceInputs.stream().limit(2).collect(Collectors.toList());
 
 		// 7 Build component instances input map to add to server
 		ComponentInstInputsMap buildComponentInstInputsMap = buildComponentInstInputsMap(vfi.getUniqueId(), inputsToAdd);
@@ -674,8 +675,8 @@ public class ExportToscaTest extends ComponentBaseTest {
 		return masterArtifact;
 	}
 
-	private ComponentInstInputsMap buildComponentInstInputsMap(String addToInput, List<InputDefinition> inputs) {
-		Map<String, List<InputDefinition>> map = new HashMap<>();
+	private ComponentInstInputsMap buildComponentInstInputsMap(String addToInput, List<ComponentInstancePropInput> inputs) {
+		Map<String, List<ComponentInstancePropInput>> map = new HashMap<>();
 		map.put(addToInput, inputs);
 		ComponentInstInputsMap componentInstInputsMap = new ComponentInstInputsMap();
 		componentInstInputsMap.setComponentInstanceInputsMap(map);
diff --git a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java
index b71240b527..633ce45178 100644
--- a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java
+++ b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java
@@ -141,10 +141,10 @@ public class InputsApiTests extends ComponentBaseTest {
 		ComponentInstance vfInstance = serviceInstances.get(0);
 		RestResponse getComponentInstanceInputsResponse = InputsRestUtils.getComponentInstanceInputs(service, vfInstance);
 		BaseValidationUtils.checkSuccess(getComponentInstanceInputsResponse);
-		List<InputDefinition> instanceInputs = new Gson().fromJson(getComponentInstanceInputsResponse.getResponse(), new TypeToken<ArrayList<InputDefinition>>(){}.getType());
+		List<ComponentInstancePropInput> instanceInputs = new Gson().fromJson(getComponentInstanceInputsResponse.getResponse(), new TypeToken<ArrayList<ComponentInstancePropInput>>(){}.getType());
 		
 		// Take only the 2 first inputs
-		List<InputDefinition> inputsToAdd = instanceInputs.stream().limit(2).collect(Collectors.toList());
+		List<ComponentInstancePropInput> inputsToAdd = instanceInputs.stream().limit(2).collect(Collectors.toList());
 		
 		// Build component instances input map to add to server
 		ComponentInstInputsMap buildComponentInstInputsMap = buildComponentInstInputsMap(vfInstance.getUniqueId(), inputsToAdd);
@@ -321,8 +321,8 @@ public class InputsApiTests extends ComponentBaseTest {
 	 * @param inputs
 	 * @return {@link org.openecomp.sdc.be.model.ComponentInstInputsMap}
 	 */
-	private ComponentInstInputsMap buildComponentInstInputsMap (String addToInput, List<InputDefinition> inputs) {
-		Map<String, List<InputDefinition>> map = new HashMap<>();
+	private ComponentInstInputsMap buildComponentInstInputsMap (String addToInput, List<ComponentInstancePropInput> inputs) {
+		Map<String, List<ComponentInstancePropInput>> map = new HashMap<>();
 		map.put(addToInput, inputs);
 		ComponentInstInputsMap componentInstInputsMap = new ComponentInstInputsMap();
 		componentInstInputsMap.setComponentInstanceInputsMap(map);