[SDC] code sync 85/6785/1
authorMichael Lando <ml636r@att.com>
Mon, 7 Aug 2017 04:05:40 +0000 (07:05 +0300)
committerMichael Lando <ml636r@att.com>
Mon, 7 Aug 2017 04:05:40 +0000 (07:05 +0300)
commitb2c60183d5d654b945a24ec5564807e4f691c6e8
treed6cdc354fa7ce27ea1e0ce60e6c57aa7c1ef20b6
parentd1d771bed17c6a5beea19af8da0bf9113972f25a
[SDC] code sync

Change-Id: I576dd69504722c341b0f41a1f6232ed3f4bee8df
Signed-off-by: Michael Lando <ml636r@att.com>
27 files changed:
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ArtifactsOperations.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverter.java
catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/converters/HeatStringConverterTest.java [new file with mode: 0644]
catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.html
catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.ts
catalog-ui/src/app/view-models/forms/resource-instance-name-form/resource-instance-name-model.ts
catalog-ui/src/app/view-models/workspace/workspace-view-model.ts
sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/keystore [new file with mode: 0644]
sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb
sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb
sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb [new file with mode: 0644]
sdc-os-chef/sdc-backend/startup.sh
sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore [new file with mode: 0644]
sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_locate_keystore.rb [new file with mode: 0644]
sdc-os-chef/sdc-frontend/chef-solo/roles/catalog-fe.json
test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/CatalogRestUtils.java
test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java
test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java
test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/GetAssetServlet.java
test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/VFCMTExternalAPI.java
test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ImportDCAE.java
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/Vf.java
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VfDeploymentInformationalArtifacts.java
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/pages/CompositionPage.java
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ServiceVerificator.java