[SDC] rebase 1710 11/5911/1
authorMichael Lando <ml636r@att.com>
Tue, 18 Jul 2017 17:46:42 +0000 (20:46 +0300)
committerMichael Lando <ml636r@att.com>
Tue, 18 Jul 2017 17:46:42 +0000 (20:46 +0300)
commit39a4e0cb1b805470ad85ed4cf4fdeb69610ae98c
tree9faa499670544cce1ec5510c242ad984871ca32d
parentb8e2faf476202b6ffe61bc3a9a37df1304881d40
[SDC] rebase 1710

Change-Id: I07fced02f40a57700d9d35ed3ba498bca351fb13
Signed-off-by: Michael Lando <ml636r@att.com>
85 files changed:
asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java
asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java
asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/execute/imports/ToscaTemplateVersionTest.java [new file with mode: 0644]
asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/ToscaParserUtils.java
asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java
asdc-tests/src/test/resources/CI/tests/importToscaResourceByCreateUrl/loadBalancerTestVersion.yml [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationConfigManager.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuter.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ValidatorExecuter.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuter.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/ServiceValidationTask.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/TopologyTemplateValidationTask.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/VfValidationTask.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactValidationUtils.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ServiceArtifactValidationTask.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/VfArtifactValidationTask.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnum.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ValidationTaskResult.java [new file with mode: 0644]
asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ValidationTool.java [new file with mode: 0644]
asdctool/src/main/resources/scripts/validationTool.sh [new file with mode: 0644]
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AbstractValidationsServlet.java
catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RepresentationUtils.java
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
catalog-be/src/main/resources/config/configuration.yaml
catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json [new file with mode: 0644]
catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py [new file with mode: 0644]
catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
catalog-be/src/test/java/org/openecomp/sdc/be/components/ResourceImportManagerTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java
catalog-be/src/test/java/org/openecomp/sdc/be/servlets/AbstractValidationsServletTest.java
catalog-be/src/test/resources/config/catalog-be/configuration.yaml
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/ArtifactAccessor.java [new file with mode: 0644]
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDao.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/CsarInfo.java [moved from catalog-model/src/main/java/org/openecomp/sdc/be/model/ImportCsarInfo.java with 77% similarity]
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementLifecycleOperation.java
catalog-ui/src/app/app.ts
catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts
catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.directive.ts
catalog-ui/src/app/directives/graphs-v2/composition-graph/composition-graph.html
catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-general-utils.ts
catalog-ui/src/app/directives/graphs-v2/composition-graph/utils/composition-graph-nodes-utils.ts
catalog-ui/src/app/models/components/component.ts
catalog-ui/src/app/models/components/resource.ts
catalog-ui/src/app/ng2/app.module.ts
catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.less
catalog-ui/src/app/ng2/components/properties-table/properties-table.component.less
catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.html [new file with mode: 0644]
catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.less [new file with mode: 0644]
catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.ts [new file with mode: 0644]
catalog-ui/src/app/ng2/shared/search-with-autocomplete/search-with-autocomplete.component.html [new file with mode: 0644]
catalog-ui/src/app/ng2/shared/search-with-autocomplete/search-with-autocomplete.component.less [new file with mode: 0644]
catalog-ui/src/app/ng2/shared/search-with-autocomplete/search-with-autocomplete.component.ts [new file with mode: 0644]
catalog-ui/src/app/view-models/shared/notification-custom-template.html [new file with mode: 0644]
catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view-model.ts
catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view.html
catalog-ui/src/app/view-models/workspace/tabs/composition/composition.less
catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html
catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/details/details-view.html
catalog-ui/src/app/view-models/workspace/workspace.less
catalog-ui/src/assets/styles/app.less
catalog-ui/src/assets/styles/images/sprites/sprite-global.png
catalog-ui/src/assets/styles/notification-template.less [new file with mode: 0644]
catalog-ui/src/assets/styles/sprite.less
catalog-ui/src/assets/styles/svg/source/fit-all.svg [new file with mode: 0644]
catalog-ui/src/assets/styles/svg/source/minus.svg [new file with mode: 0644]
catalog-ui/src/assets/styles/svg/source/plus.svg [new file with mode: 0644]
catalog-ui/src/assets/styles/svg/source/search-magnify.svg [new file with mode: 0644]
catalog-ui/src/third-party/cytoscape.js-edge-editation/CytoscapeEdgeEditation.js
common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java
sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
sdc-os-chef/sdc-os-common/templates/default/BE-configuration.yaml.erb
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/DataTestIdEnum.java
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/CatalogLeftPanelTest.java
ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/DriverFactory.java