diff options
17 files changed, 20 insertions, 17 deletions
diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile index 2e00ecaa20..ab2e0bd535 100644 --- a/asdctool/sdc-cassandra-init/Dockerfile +++ b/asdctool/sdc-cassandra-init/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-cqlsh:1.3.1 +FROM onap/base_sdc-cqlsh:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphMLConverter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphMLConverter.java index f036c397f1..5fb5c7e7cf 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphMLConverter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphMLConverter.java @@ -449,7 +449,6 @@ public class GraphMLConverter { } } catch (Exception e) { - e.printStackTrace(); log.info("run Vertex Scan failed - {}" , e); Object property1 = vertex.value(GraphPropertiesDictionary.HEALTH_CHECK.getProperty()); diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/handlers/XlsOutputHandler.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/handlers/XlsOutputHandler.java index 91eaed5429..0ce03b14e9 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/handlers/XlsOutputHandler.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/tasks/handlers/XlsOutputHandler.java @@ -57,8 +57,7 @@ public class XlsOutputHandler implements OutputHandler { workbook.write(new FileOutputStream(fileName)); return true; } catch (Exception e) { - LOGGER.error("Failed to write an output file upon Upgrade migration 1710. Exception {} occured. ", e.getMessage()); - e.printStackTrace(); + LOGGER.error("Failed to write an output file upon Upgrade migration 1710. Exception {} occured. ", e); return false; } } diff --git a/catalog-be/sdc-backend-init/Dockerfile b/catalog-be/sdc-backend-init/Dockerfile index 23847b43f8..5f5f451961 100644 --- a/catalog-be/sdc-backend-init/Dockerfile +++ b/catalog-be/sdc-backend-init/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-python:1.3.1 +FROM onap/base_sdc-python:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/catalog-be/sdc-backend/Dockerfile b/catalog-be/sdc-backend/Dockerfile index 70d03a55c3..e3e66e52d4 100644 --- a/catalog-be/sdc-backend/Dockerfile +++ b/catalog-be/sdc-backend/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-jetty:1.3.1 +FROM onap/base_sdc-jetty:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile index bc4336653b..55fe1fa46b 100644 --- a/catalog-fe/sdc-frontend/Dockerfile +++ b/catalog-fe/sdc-frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-jetty:1.3.1 +FROM onap/base_sdc-jetty:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java index 77677a9245..d9318f5510 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTypeOperation.java @@ -83,7 +83,10 @@ public class NodeTypeOperation extends ToscaElementOperation { nodeType.generateUUID(); + //Set missing props such as names, default lifecycle state, dates etc... nodeType = getResourceMetaDataFromResource(nodeType); + + //Set unique ID String resourceUniqueId = nodeType.getUniqueId(); if (resourceUniqueId == null) { resourceUniqueId = UniqueIdBuilder.buildResourceUniqueId(); @@ -100,9 +103,11 @@ public class NodeTypeOperation extends ToscaElementOperation { derivedResources = derivedResourcesResult.left().value(); } + //Create Vertext Object and fill according to given NodeType GraphVertex nodeTypeVertex = new GraphVertex(VertexTypeEnum.NODE_TYPE); fillToscaElementVertexData(nodeTypeVertex, nodeType, JsonParseFlagEnum.ParseAll); + //Create Node Type in Graph Either<GraphVertex, TitanOperationStatus> createdVertex = titanDao.createVertex(nodeTypeVertex); if (createdVertex.isRight()) { TitanOperationStatus status = createdVertex.right().value(); diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index e3e15cb639..4a1921a804 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-jetty:1.3.1 +FROM onap/base_sdc-jetty:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile index 93e8ec3dd2..83ab4869c3 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-cqlsh:1.3.1 +FROM onap/base_sdc-cqlsh:1.4.0-SNAPSHOT-latest COPY init_keyspaces.cql /root/ diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile index 976a46aaab..2dd140537f 100644 --- a/sdc-os-chef/sdc-cassandra/Dockerfile +++ b/sdc-os-chef/sdc-cassandra/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-cassandra:1.3.1 +FROM onap/base_sdc-cassandra:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-elasticsearch/Dockerfile b/sdc-os-chef/sdc-elasticsearch/Dockerfile index 8609a4ce10..15a3650a1a 100644 --- a/sdc-os-chef/sdc-elasticsearch/Dockerfile +++ b/sdc-os-chef/sdc-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-elasticsearch:1.3.1 +FROM onap/base_sdc-elasticsearch:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-init-elasticsearch/Dockerfile b/sdc-os-chef/sdc-init-elasticsearch/Dockerfile index 3a0c0c4d51..acc4db86f4 100644 --- a/sdc-os-chef/sdc-init-elasticsearch/Dockerfile +++ b/sdc-os-chef/sdc-init-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-sanity:1.3.1 +FROM onap/base_sdc-sanity:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-kibana/Dockerfile b/sdc-os-chef/sdc-kibana/Dockerfile index 961642a78d..01352708df 100644 --- a/sdc-os-chef/sdc-kibana/Dockerfile +++ b/sdc-os-chef/sdc-kibana/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-kibana:1.3.1 +FROM onap/base_sdc-kibana:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/test-apis-ci/sdc-api-tests/Dockerfile b/test-apis-ci/sdc-api-tests/Dockerfile index 25e22c5ccf..b5978cb642 100644 --- a/test-apis-ci/sdc-api-tests/Dockerfile +++ b/test-apis-ci/sdc-api-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-sanity:1.3.1 +FROM onap/base_sdc-sanity:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/ui-ci/sdc-ui-tests/Dockerfile b/ui-ci/sdc-ui-tests/Dockerfile index 1aa84c5e94..d303ced334 100644 --- a/ui-ci/sdc-ui-tests/Dockerfile +++ b/ui-ci/sdc-ui-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-vnc:1.3.1 +FROM onap/base_sdc-vnc:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile index 5b115530e7..ca74a81484 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile +++ b/utils/webseal-simulator/sdc-simulator/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-jetty:1.3.1 +FROM onap/base_sdc-jetty:1.4.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb index 17ed3482bb..9df4b0af6e 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb @@ -1,6 +1,6 @@ jetty_base="/var/lib/jetty" -if !ENV['FE_URL'].empty? +if ENV['FE_URL'] fe_url="#{ENV['FE_URL']}" elsif node['disableHttp'] fe_url="https://#{node['Nodes']['FE']}:#{node['FE'][:https_port]}" |