Align current csit testing - fix CSIT tests

Change-Id: I63e1af740ca281da404231bb3bff67f4c94541e1
Issue-ID: SDC-1097
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>

diff --git a/.gitignore b/.gitignore
index 9c445a8..0bef7c0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -259,3 +259,5 @@ sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/*
 
 *normatives.tar.gz
 /openecomp-ui/yarn.lock
+
+/openecomp-ui/yarn.lock

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
index f6cb50c..0dce2a3 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
@@ -2857,7 +2857,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         String value = null;
         List<GetInputValueDataDefinition> getInputs = null;
         boolean isValidate = true;
-        if (propertyInfo.getValue() != null) {
+        if (null != propertyInfo && propertyInfo.getValue() != null) {
             getInputs = propertyInfo.getGet_input();
             isValidate = getInputs == null || getInputs.isEmpty();
             if (isValidate) {

diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
index 5f8eeca..599ce00 100644 (file)
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
@@ -81,8 +81,6 @@ public class ResourceRestUtils extends BaseRestUtils {
                String calculateMD5 = GeneralUtility.calculateMD5Base64EncodedByString(userBodyJson);
                headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), calculateMD5);
                HttpRequest http = new HttpRequest();
-               // System.out.println(url);
-               // System.out.println(userBodyJson);
                RestResponse createResourceResponse = http.httpSendPost(url, userBodyJson, headersMap);
                if (createResourceResponse.getErrorCode() == STATUS_CODE_CREATED) {
                        resourceDetails.setUUID(ResponseParser.getUuidFromResponse(createResourceResponse));