Merge "Add new fields to config file in slice-analysis and remove unused files"
authorMorgan Richomme <morgan.richomme@orange.com>
Tue, 27 Apr 2021 14:23:36 +0000 (14:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 27 Apr 2021 14:23:36 +0000 (14:23 +0000)
117 files changed:
INFO.yaml
plans/optf-has/has/setup.sh [deleted file]
plans/optf-has/has/teardown.sh [deleted file]
plans/optf-has/has/testplan.txt [deleted file]
plans/optf-osdf/osdf/setup.sh [deleted file]
plans/optf-osdf/osdf/teardown.sh [deleted file]
plans/optf-osdf/osdf/testplan.txt [deleted file]
plans/so/integration-etsi-testing/config/apply-workarounds.sh
plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/GenericVnfsController.java
plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProvider.java
plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProviderImpl.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/pom.xml
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/MultiCloudSimulatorApplication.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/InstanceNameOutput.java [new file with mode: 0644]
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/InstanceOutput.java [new file with mode: 0644]
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/InstanceResponse.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/MulticloudCreateResponse.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/MulticloudInstanceRequest.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/MulticloudRequest.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/Resource.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/Response.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/configuration/ApplicationConfiguration.java [moved from plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/configration/ApplicationConfigration.java with 77% similarity]
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/configuration/WebSecurityConfigImpl.java [moved from plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/configration/WebSecurityConfigImpl.java with 90% similarity]
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/controller/MultiCloudController.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/utils/Constants.java
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/resources/application.properties
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/resources/application.yaml
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/resources/data/InstanceNameOutput.json [new file with mode: 0644]
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/resources/data/InstanceOutput.json [new file with mode: 0644]
plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/test/java/org/onap/so/multicloudsimulator/MultiCloudSimulatorApplicationTests.java
plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/ConfigController.java [new file with mode: 0644]
plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/providers/ServiceOperationsCacheServiceProvider.java
plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/providers/ServiceOperationsCacheServiceProviderimpl.java
plans/so/macroflow/cloud_owner_sql/cloud_owner.sql [deleted file]
plans/so/macroflow/config/distribution-test-zip/macro_zipped_sdc_csar.tar.gz [new file with mode: 0755]
plans/so/macroflow/config/env [new file with mode: 0644]
plans/so/macroflow/config/mariadb_engine_7.10.0.sql [new file with mode: 0644]
plans/so/macroflow/config/override-files/api-handler-infra/onapheat/override.yaml [new file with mode: 0644]
plans/so/macroflow/config/override-files/bpmn-infra/onapheat/override.yaml [new file with mode: 0644]
plans/so/macroflow/config/override-files/catalog-db-adapter/onapheat/override.yaml [new file with mode: 0644]
plans/so/macroflow/config/override-files/openstack-adapter/onapheat/override.yaml [new file with mode: 0644]
plans/so/macroflow/config/override-files/sdc-controller/onapheat/override.yaml [new file with mode: 0644]
plans/so/macroflow/config/override-files/so-monitoring/onapheat/override.yaml [new file with mode: 0644]
plans/so/macroflow/config/override-files/so-vnfm-adapter/onapheat/override.yaml [new file with mode: 0644]
plans/so/macroflow/config/override-files/vnfm-simulator/onapheat/override.yaml [new file with mode: 0644]
plans/so/macroflow/docker-compose.local.yml [new file with mode: 0644]
plans/so/macroflow/docker-compose.yml [new file with mode: 0644]
plans/so/macroflow/setup.sh
plans/so/macroflow/teardown.sh
scripts/integration/nfsimulator/netconf-server/docker-compose.yml
scripts/optf-has/has/has-properties/AAF_RootCA.cer [deleted file]
scripts/optf-has/has/has-properties/conductor.conf.onap [deleted file]
scripts/optf-has/has/has-properties/has.json [deleted file]
scripts/optf-has/has/has-properties/log.conf.onap [deleted file]
scripts/optf-has/has/has_proxy_settings.sh [deleted file]
scripts/optf-has/has/has_script.sh [deleted file]
scripts/optf-has/has/has_teardown_script.sh [deleted file]
scripts/optf-has/has/music-properties/log4j.properties [deleted file]
scripts/optf-has/has/music-properties/music.properties [deleted file]
scripts/optf-has/has/music_script.sh [deleted file]
scripts/optf-has/has/music_teardown_script.sh [deleted file]
scripts/optf-has/has/setup-sms.sh [deleted file]
scripts/optf-has/has/simulator_script.sh [deleted file]
scripts/optf-has/has/simulator_teardown_script.sh [deleted file]
scripts/optf-has/has/wait_for_port.sh [deleted file]
scripts/optf-osdf/osdf/osdf-properties/aaf_root_ca.cer [deleted file]
scripts/optf-osdf/osdf/osdf-properties/osdf.json [deleted file]
scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml [deleted file]
scripts/optf-osdf/osdf/osdf_proxy_settings.sh [deleted file]
scripts/optf-osdf/osdf/osdf_script.sh [deleted file]
scripts/optf-osdf/osdf/setup-sms.sh [deleted file]
scripts/optf-osdf/osdf/simulator_script.sh [deleted file]
scripts/optf-osdf/osdf/wait_for_port.sh [deleted file]
tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot
tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json
tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/dcae-unsupported-namespace-request.json [new file with mode: 0644]
tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/xnf-unsupported-namespace-request.json [new file with mode: 0644]
tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/dcae-stnd-defined-payload-request.json [new file with mode: 0644]
tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/xnf-stnd-defined-payload-request.json [new file with mode: 0644]
tests/integration/nfsimulator/netconf-server/assets/pnf-simulator-data.xml [new file with mode: 0644]
tests/integration/nfsimulator/netconf-server/netconf-server-rest-test.robot
tests/integration/nfsimulator/netconf-server/resources/netconf-server-keywords.robot
tests/integration/nfsimulator/netconf-server/resources/netconf-server-properties.robot
tests/optf-has/has/__init__.robot [deleted file]
tests/optf-has/has/data/healthcheck.json [deleted file]
tests/optf-has/has/data/nsi_selection_template_with_create.json [deleted file]
tests/optf-has/has/data/nsi_selection_template_with_nonsi.json [deleted file]
tests/optf-has/has/data/nsi_selection_template_with_reuse.json [deleted file]
tests/optf-has/has/data/nssi_selection_template.json [deleted file]
tests/optf-has/has/data/nssi_selection_template_unmatched.json [deleted file]
tests/optf-has/has/data/nst_selection_template.json [deleted file]
tests/optf-has/has/data/onboard.json [deleted file]
tests/optf-has/has/data/plan_with_hpa.json [deleted file]
tests/optf-has/has/data/plan_with_hpa_requirements_mandatory.json [deleted file]
tests/optf-has/has/data/plan_with_hpa_requirements_optionals.json [deleted file]
tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json [deleted file]
tests/optf-has/has/data/plan_with_hpa_simple.json [deleted file]
tests/optf-has/has/data/plan_with_hpa_unmatched.json [deleted file]
tests/optf-has/has/data/plan_with_lati_and_longi.json [deleted file]
tests/optf-has/has/data/plan_with_short_distance_constraint.json [deleted file]
tests/optf-has/has/data/plan_with_vim_fit.json [deleted file]
tests/optf-has/has/data/plan_with_wrong_distance_constraint.json [deleted file]
tests/optf-has/has/data/plan_with_wrong_version.json [deleted file]
tests/optf-has/has/data/plan_without_demand_section.json [deleted file]
tests/optf-has/has/optf_has_test.robot [deleted file]
tests/optf-osdf/osdf/__init__.robot [deleted file]
tests/optf-osdf/osdf/data/pci-opt-request.json [deleted file]
tests/optf-osdf/osdf/data/placement_request.json [deleted file]
tests/optf-osdf/osdf/optf_osdf_setup.robot [deleted file]
tests/optf-osdf/osdf/optf_osdf_test.robot [deleted file]
tests/optf-osdf/osdf/resources/common-keywords.robot [deleted file]
tests/sdc/sdc-helm-validator/sdc-helm-validator.robot
tests/so/sanity-check/macroflow.robot
tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot

index d7a0859..cd7031b 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -36,26 +36,11 @@ committers:
       company: 'ATT'
       id: 'ChrisC'
       timezone: 'Belgium/Namur'
-    - name: 'Daniel Rose'
-      email: 'DR695H@att.com'
-      company: 'ATT'
-      id: 'DR695H'
-      timezone: 'America/New York'
-    - name: 'Fu Jinhua'
-      email: 'fu.jinhua@zte.com.cn'
-      company: 'ZTE'
-      id: 'fujinhua'
-      timezone: 'China/Beijing'
     - name: 'Catherine Lefevre'
       email: 'cl664y@att.com'
       company: 'AT&T'
       id: 'Katel34'
       timezone: 'Belgium/Namur'
-    - name: 'Marco Platania'
-      email: 'platania@research.att.com'
-      company: 'ATT'
-      id: 'platania'
-      timezone: 'America/New York'
     - name: 'Brian Freeman'
       email: 'bf1936@att.com'
       company: 'AT&T'
@@ -111,6 +96,11 @@ committers:
       company: 'samsung'
       id: 'kaihlavi'
       timezone: 'Europe/Helsinki'
+    - name: 'Illia Halych'
+      email: 'illia.halych@t-mobile.pl'
+      company: 'T-Mobile'
+      id: 'elihalych'
+      timezone: 'Europe/Warsaw'
 tsc:
     # yamllint disable rule:line-length
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
@@ -142,3 +132,6 @@ tsc:
         - type: 'Addition'
           name: 'Lasse Kaihlavirta'
           link: 'https://lists.onap.org/g/onap-tsc/message/7280'
+        - type: 'Addition'
+          name: 'Illia Halych'
+          link: 'https://lists.onap.org/g/onap-tsc/message/7696'
diff --git a/plans/optf-has/has/setup.sh b/plans/optf-has/has/setup.sh
deleted file mode 100755 (executable)
index db3ec7c..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "# aaf-sms setup.sh script";
-source ${WORKSPACE}/scripts/optf-has/has/setup-sms.sh
-
-#
-# add here eventual scripts needed for music
-#
-echo "# music scripts calling";
-source ${WORKSPACE}/scripts/optf-has/has/music_script.sh
-
-
-#
-echo "# simulator scripts calling";
-source ${WORKSPACE}/scripts/optf-has/has/simulator_script.sh
-
-# add here eventual scripts needed for optf/has
-#
-echo "# optf/has scripts calling";
-source ${WORKSPACE}/scripts/optf-has/has/has_script.sh
-
-#
-# add here below the start of all docker containers needed for optf/has CSIT testing
-#
-echo "# optf/has scripts docker containers spinoff";
-
-#
-# add here all the configuration steps eventually needed to be carried out for optf/has CSIT testing
-#
-echo "# optf/has configuration step";
-
-
-#
-# add here all ROBOT_VARIABLES settings
-#
-echo "# optf/has robot variables settings";
-echo "conductor ip = ${COND_IP}"
-echo "music ip = ${TOMCAT_IP}"
-
-ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://${TOMCAT_IP} -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://${COND_IP} -v COND_PORT:8091"
-
-echo ${ROBOT_VARIABLES}
-
-
-
diff --git a/plans/optf-has/has/teardown.sh b/plans/optf-has/has/teardown.sh
deleted file mode 100755 (executable)
index 0b2b629..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-#
-# add here below the killing of all docker containers used for optf/has CSIT testing
-#
-
-#
-# optf/has scripts docker containers killing";
-#
-echo "# optf/has has scripts calling";
-source ${WORKSPACE}/scripts/optf-has/has/has_teardown_script.sh
-
-echo "# optf/has simulator scripts calling";
-source ${WORKSPACE}/scripts/optf-has/has/simulator_teardown_script.sh
-
-echo "# optf/has music scripts calling";
-source ${WORKSPACE}/scripts/optf-has/has/music_teardown_script.sh
-
-echo "# aaf-sms teardown.sh script";
-kill-instance.sh sms
-kill-instance.sh vault
-
diff --git a/plans/optf-has/has/testplan.txt b/plans/optf-has/has/testplan.txt
deleted file mode 100644 (file)
index bf92270..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-optf-has/has
diff --git a/plans/optf-osdf/osdf/setup.sh b/plans/optf-osdf/osdf/setup.sh
deleted file mode 100755 (executable)
index 42e9aec..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-#
-echo "# aaf-sms setup.sh script";
-source ${WORKSPACE}/scripts/optf-osdf/osdf/setup-sms.sh
-
-echo "# simulator scripts calling";
-source ${WORKSPACE}/scripts/optf-osdf/osdf/simulator_script.sh
-
-# add here eventual scripts needed for optf/osdf
-#
-echo "# optf/osdf scripts calling";
-source ${WORKSPACE}/scripts/optf-osdf/osdf/osdf_script.sh
-
-#
-# add here below the start of all docker containers needed for optf/osdf CSIT testing
-#
-echo "# optf/osdf scripts docker containers spinoff";
-
-#
-# add here all the configuration steps eventually needed to be carried out for optf/osdf CSIT testing
-#
-echo "# optf/osdf configuration step";
-
-
-#
-# add here all ROBOT_VARIABLES settings
-#
-echo "# optf/osdf robot variables settings";
-echo "osdf ip = ${OSDF_IP}"
-
-ROBOT_VARIABLES="-v OSDF_HOSTNAME:http://${OSDF_IP}  -v OSDF_PORT:8699"
-
-echo ${ROBOT_VARIABLES}
-
-
-
diff --git a/plans/optf-osdf/osdf/teardown.sh b/plans/optf-osdf/osdf/teardown.sh
deleted file mode 100755 (executable)
index 3457295..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-
-#
-# add here below the killing of all docker containers used for optf/osdf CSIT testing
-#
-
-#
-# optf/osdf scripts docker containers killing";
-#
-
-kill-instance.sh optf-osdf
-kill-instance.sh osdf_sim
-
-echo "# aaf-sms teardown.sh script";
-kill-instance.sh sms
-kill-instance.sh vault
-
diff --git a/plans/optf-osdf/osdf/testplan.txt b/plans/optf-osdf/osdf/testplan.txt
deleted file mode 100644 (file)
index 87a2d54..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2015-2017 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
-# Place the suites in run order.
-optf-osdf/osdf
index 21a3aeb..4ecf880 100755 (executable)
@@ -109,6 +109,8 @@ mysql -h $DB_HOST -uroot -p$MYSQL_ROOT_PASSWORD $CATALOG_DB << EOF
 
  UPDATE orchestration_status_state_transition_directive SET FLOW_DIRECTIVE='CONTINUE' WHERE RESOURCE_TYPE='VNF' AND ORCHESTRATION_STATUS='CREATED' AND TARGET_ACTION='ACTIVATE' AND FLOW_DIRECTIVE='FAIL';
 
+ insert into cloud_sites(ID, REGION_ID, IDENTITY_SERVICE_ID, CLOUD_VERSION, CLLI, ORCHESTRATOR) values("EtsiCloudRegion", "EtsiCloudRegion", "DEFAULT_KEYSTONE", "2.5", "clli2", "multicloud");
+
  COMMIT;
 EOF
 
index 27a0e79..22209fc 100644 (file)
@@ -241,9 +241,8 @@ public class GenericVnfsController {
         return getRequestErrorResponseEntity(request, VF_MODULE);
 
     }
-    
-    
-    
+
+
     @PutMapping(value = "/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
             produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ResponseEntity<?> putVfModule(@RequestBody final VfModule vfModule,
index 0ee2d00..5570381 100644 (file)
@@ -24,8 +24,6 @@ import java.util.Optional;
 import org.onap.aai.domain.yang.GenericVnf;
 import org.onap.aai.domain.yang.Relationship;
 import org.onap.aai.domain.yang.VfModule;
-import org.onap.aai.domain.yang.VfModules;
-import org.onap.aai.domain.yang.v10.VolumeGroup;
 import org.springframework.http.HttpHeaders;
 
 /**
@@ -52,9 +50,9 @@ public interface GenericVnfCacheServiceProvider extends Clearable {
 
     boolean deleteGenericVnf(final String vnfId, final String resourceVersion);
 
-       void putVfModule(String vnfId, String vfModuleId, VfModule vfModule);
+    void putVfModule(final String vnfId, final String vfModuleId, final VfModule vfModule);
 
-       Optional<VfModule> getVfModule(final String vnfId, final String vfModuleId);
+    Optional<VfModule> getVfModule(final String vnfId, final String vfModuleId);
 
-       boolean patchVfModule(String vnfId, String vfModuleId, VfModule vfModule);
+    boolean patchVfModule(final String vnfId, final String vfModuleId, final VfModule vfModule);
 }
index 5a0423b..24544a6 100644 (file)
@@ -24,7 +24,6 @@ import static org.onap.so.aaisimulator.utils.Constants.COMPOSED_OF;
 import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
 import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_ID;
 import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_NAME;
-import static org.onap.so.aaisimulator.utils.Constants.X_HTTP_METHOD_OVERRIDE;
 import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getBiDirectionalRelationShipListRelatedLink;
 import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getRelationShipListRelatedLink;
 import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getTargetUrl;
@@ -39,9 +38,7 @@ import org.onap.aai.domain.yang.Relationship;
 import org.onap.aai.domain.yang.RelationshipData;
 import org.onap.aai.domain.yang.RelationshipList;
 import org.onap.aai.domain.yang.VfModule;
-import org.onap.aai.domain.yang.v10.VfModules;
-import org.onap.aai.domain.yang.VolumeGroup;
-import org.onap.aai.domain.yang.v10.VolumeGroups;
+import org.onap.aai.domain.yang.VfModules;
 import org.onap.so.aaisimulator.utils.ShallowBeanCopy;
 import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
 import org.slf4j.Logger;
@@ -63,7 +60,6 @@ public class GenericVnfCacheServiceProviderImpl extends AbstractCacheServiceProv
     private static final Logger LOGGER = LoggerFactory.getLogger(GenericVnfCacheServiceProviderImpl.class);
 
     private final HttpRestServiceProvider httpRestServiceProvider;
-    final org.onap.aai.domain.yang.VfModules vfModules = new org.onap.aai.domain.yang.VfModules();
 
     @Autowired
     public GenericVnfCacheServiceProviderImpl(final CacheManager cacheManager,
@@ -261,55 +257,58 @@ public class GenericVnfCacheServiceProviderImpl extends AbstractCacheServiceProv
         clearCache(GENERIC_VNF_CACHE.getName());
     }
 
-       @Override
-       public Optional<org.onap.aai.domain.yang.VfModule> getVfModule(final String vnfId, final String vfModuleId) {
-               LOGGER.info("Getting vfModule from cache for vnfId: {} and vfModuleId: {}",
-                               vnfId, vfModuleId);
-        final Cache cache = getCache(GENERIC_VNF_CACHE.getName());
-        final GenericVnf value = cache.get(vnfId, GenericVnf.class);
+    @Override
+    public Optional<VfModule> getVfModule(final String vnfId, final String vfModuleId) {
         LOGGER.info("Getting vfModule from cache for vnfId: {} and vfModuleId: {}",
                 vnfId, vfModuleId);
-        if (value.getVfModules() != null) {
-            for (int i=0; i<value.getVfModules().getVfModule().size(); i++)
-            {
-                if(value.getVfModules().getVfModule().get(i).getVfModuleId().equalsIgnoreCase(vfModuleId)){
-                    return Optional.of(value.getVfModules().getVfModule().get(i));
+        final Optional<GenericVnf> genericVnfOptional = getGenericVnf(vnfId);
+        final GenericVnf value = genericVnfOptional.get();
+        final VfModules vfmodules = value.getVfModules();
+        if (vfmodules != null) {
+            for (VfModule vfModule : vfmodules.getVfModule()) {
+                 if (vfModule.getVfModuleId().equalsIgnoreCase(vfModuleId)){
+                    return Optional.of(vfModule);
                 }
             }
         }
-               return Optional.empty();
-       }
+        return Optional.empty();
+    }
+
 
-       @Override
-       public void putVfModule(String vnfId, String vfModuleId, VfModule vfModule) {
-        LOGGER.info("Adding vfModule from cache for vnfId: {} and vfModuleId: {}",
+    @Override
+    public void putVfModule(final String vnfId, final String vfModuleId, final VfModule vfModule) {
+        LOGGER.info("Adding vfModule for vnfId: {} and vfModuleId: {}",
                 vnfId, vfModuleId);
         final Optional<GenericVnf> genericVnfOptional = getGenericVnf(vnfId);
         final Cache cache = getCache(GENERIC_VNF_CACHE.getName());
         if (genericVnfOptional.isPresent()) {
             final GenericVnf genericVnf = genericVnfOptional.get();
+            VfModules vfModules = null;
+            if(genericVnf.getVfModules()==null){
+                vfModules = new VfModules();
+                genericVnf.setVfModules(vfModules);
+            } else {
+                vfModules = genericVnf.getVfModules();
+            }
 
             vfModules.getVfModule().add(vfModule);
-            genericVnf.setVfModules(vfModules);
             cache.put(vfModuleId, vfModule);
         }
-       }
+    }
 
-       @Override
-       public boolean patchVfModule(String vnfId, String vfModuleId, VfModule vfModule) {
-               final Optional<GenericVnf> genericVnfOptional = getGenericVnf(vnfId);
+    @Override
+    public boolean patchVfModule(final String vnfId, final String vfModuleId, final VfModule vfModule) {
+        final Optional<GenericVnf> genericVnfOptional = getGenericVnf(vnfId);
         LOGGER.info("Create vfModule for vnfId: {} and vfModuleId: {}",
                 vnfId, vfModuleId);
         if (genericVnfOptional.isPresent()) {
-               final GenericVnf cachedGenericVnf = genericVnfOptional.get();
+            final GenericVnf cachedGenericVnf = genericVnfOptional.get();
+            final VfModules vfmodules = cachedGenericVnf.getVfModules();
             LOGGER.info("vfModuleId is Matched");
             try {
-                for (int i=0; i<cachedGenericVnf.getVfModules().getVfModule().size(); i++)
-                {
-                          if(cachedGenericVnf.getVfModules().getVfModule().get(i).getVfModuleId().equalsIgnoreCase(vfModuleId)){
-                              cachedGenericVnf.getVfModules().getVfModule().get(i).setOrchestrationStatus(vfModule.getOrchestrationStatus());
-                      }
-                }
+                vfmodules.getVfModule().stream().filter(tempVfModule ->
+                        tempVfModule.getVfModuleId().equalsIgnoreCase(vfModuleId)).forEach(tempVfModule ->
+                        tempVfModule.setOrchestrationStatus(vfModule.getOrchestrationStatus()));
                 return true;
             } catch (final Exception exception) {
                 LOGGER.error("Unable to update VfModule for vfModuleId: {}", vfModule, exception);
@@ -317,5 +316,5 @@ public class GenericVnfCacheServiceProviderImpl extends AbstractCacheServiceProv
         }
         LOGGER.error("Unable to find VfModule ...");
         return false;
-       }
+    }
 }
\ No newline at end of file
index 926ea14..80e2174 100644 (file)
@@ -1,74 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.so.simulators</groupId>
-               <artifactId>so-simulators</artifactId>
-               <version>1.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>multicloud-simulator</artifactId>
-       <name>${project.artifactId}</name>
-       <description>Demo project for Spring Boot</description>
-       <properties>
-               <java.version>11</java.version>
-       </properties>
-       <dependencies>
-           <dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.so.simulators</groupId>
+        <artifactId>so-simulators</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>multicloud-simulator</artifactId>
+    <name>${project.artifactId}</name>
+    <description>MultiCloud Simulator</description>
+    <properties>
+        <java.version>11</java.version>
+        <json-simple.version>1.1</json-simple.version>
+        <openstack4j.version>3.2.0</openstack4j.version>
+        <openstack4j-httpclient.version>3.2.0</openstack4j-httpclient.version>
+        <mso-adapters.version>1.7.1-SNAPSHOT</mso-adapters.version>
+        <spring-security.version>2.1.1.RELEASE</spring-security.version>
+    </properties>
+    <dependencies>
+        <dependency>
             <groupId>${project.parent.groupId}</groupId>
             <artifactId>common</artifactId>
             <version>${project.version}</version>
         </dependency>
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-test</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-security</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.springframework.boot</groupId>
-                                       <artifactId>spring-boot-starter-tomcat</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                   <groupId>com.googlecode.json-simple</groupId>  
-                   <artifactId>json-simple</artifactId>  
-                   <version>1.1</version>  
-               </dependency>
-
-               <dependency>
-                       <groupId>org.pacesys</groupId>
-                              <artifactId>openstack4j-core</artifactId>
-                       <version>3.2.0</version>
-               </dependency>
-               <dependency>
-            <groupId>org.pacesys.openstack4j.connectors</groupId>
-                       <artifactId>openstack4j-httpclient</artifactId>
-                       <version>3.2.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.so.adapters</groupId>
-                       <artifactId>mso-adapters-rest-interface</artifactId>
-                       <version>1.7.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.security.oauth.boot</groupId>
-                       <artifactId>spring-security-oauth2-autoconfigure</artifactId>
-                       <version>2.1.1.RELEASE</version>
-               </dependency>
-       </dependencies>
-
-       <build>
-               <plugins>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>${json-simple.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.so.adapters</groupId>
+            <artifactId>mso-adapters-rest-interface</artifactId>
+            <version>${mso-adapters.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+            <version>${spring-security.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                     </execution>
                 </executions>
             </plugin>
-                       <plugin>
-                               <groupId>org.springframework.boot</groupId>
-                               <artifactId>spring-boot-maven-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-</project>
+</project>
\ No newline at end of file
index 949cd9b..479c481 100644 (file)
@@ -1,13 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright 2021 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 package org.onap.so.multicloudsimulator;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(scanBasePackages = {"org.onap"})
+/**
+ * @author Md Irshad Sheikh (md.irshad.sheikh@huawei.com)
+ *
+ */
+@SpringBootApplication(scanBasePackages = { "org.onap" })
 public class MultiCloudSimulatorApplication {
 
-       public static void main(String[] args) {
-               SpringApplication.run(MultiCloudSimulatorApplication.class, args);
-       }
+    public static void main(String[] args) {
+        SpringApplication.run(MultiCloudSimulatorApplication.class, args);
 
-}
+    }
+
+}
\ No newline at end of file
diff --git a/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/InstanceNameOutput.java b/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/InstanceNameOutput.java
new file mode 100644 (file)
index 0000000..1bf902a
--- /dev/null
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright 2021 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.multicloudsimulator.beans;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Component;
+import java.io.IOException;
+import java.io.InputStream;
+
+@Component
+@PropertySource(value = "data/InstanceNameOutput.json")
+@ConfigurationProperties
+public class InstanceNameOutput {
+    private String template_type;
+    private String workload_id;
+    private String workload_status;
+    public JsonNode workload_status_reason;
+
+    public  String getTemplate_type() {
+        return template_type;
+    }
+
+    public void setTemplate_type(final String template_type) {
+        this.template_type = template_type;
+    }
+
+    public String getWorkload_id() {
+        return workload_id;
+    }
+
+    public void setWorkload_id(final String workload_id) {
+        this.workload_id = workload_id;
+    }
+
+    public String getWorkload_status() {
+        return workload_status;
+    }
+
+    public void setWorkload_status(final String workload_status) {
+        this.workload_status = workload_status;
+    }
+
+    public JsonNode getWorkload_status_reason() {
+        return workload_status_reason;
+    }
+
+    public void setWorkload_status_reason(final JsonNode workload_status_reason) {
+        this.workload_status_reason = workload_status_reason;
+    }
+
+    public final static InputStream getFile(final String file) throws IOException {
+        return new ClassPathResource(file).getInputStream();
+    }
+
+    public final static InputStream getInstanceName() throws Exception, IOException {
+        return getFile("data/InstanceNameOutput.json");
+    }
+}
diff --git a/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/InstanceOutput.java b/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/InstanceOutput.java
new file mode 100644 (file)
index 0000000..2cb1fca
--- /dev/null
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright 2021 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.multicloudsimulator.beans;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Component;
+import java.io.IOException;
+import java.io.InputStream;
+
+@Component
+@PropertySource(value = "data/InstanceOutput.json")
+@ConfigurationProperties
+public class InstanceOutput {
+    private static final Logger LOGGER = LoggerFactory.getLogger(InstanceOutput.class);
+    private String template_type;
+    private String workload_id;
+    private String workload_status;
+    public JsonNode workload_status_reason;
+
+    public JsonNode getWorkload_status_reason() {
+        return workload_status_reason;
+    }
+
+    public void setWorkload_status_reason(final JsonNode workload_status_reason) {
+        this.workload_status_reason = workload_status_reason;
+    }
+
+    public String getTemplate_type() {
+        return template_type;
+    }
+
+    public void setTemplate_type(final String template_type) {
+        this.template_type = template_type;
+    }
+
+    public String getWorkload_id() {
+        return workload_id;
+    }
+
+    public void setWorkload_id(final String workload_id) {
+        this.workload_id = workload_id;
+    }
+
+    public String getWorkload_status() {
+        return workload_status;
+    }
+
+    public void setWorkload_status(final String workload_status) {
+        this.workload_status = workload_status;
+    }
+
+    public static InputStream getFile(final String file) throws IOException {
+        return new ClassPathResource(file).getInputStream();
+    }
+
+    public static InputStream getInstance() throws Exception, IOException {
+        return getFile("data/InstanceOutput.json");
+    }
+}
index e8f9e12..c8a5821 100644 (file)
@@ -1,9 +1,6 @@
-
 /*-
  * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright 2021 Huawei Technologies Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,14 +19,13 @@ package org.onap.so.multicloudsimulator.beans;
 
 import java.util.List;
 
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"id", "request", "namespace", "resources"})
+@JsonPropertyOrder({ "id", "request", "namespace", "resources" })
 @JsonIgnoreProperties(value = "true")
 public class InstanceResponse extends Response {
 
@@ -42,51 +38,43 @@ public class InstanceResponse extends Response {
     @JsonProperty("resources")
     private List<Resource> resources = null;
 
-    public InstanceResponse(String errorMsg) {
+    public InstanceResponse(final String errorMsg) {
         super(errorMsg);
     }
 
     public InstanceResponse() {
-       super("");
-       //new Response("");
-    } 
-    @JsonProperty("id")
+        super("");
+    }
+
     public String getId() {
         return id;
     }
 
-    @JsonProperty("id")
-    public void setId(String id) {
+    public void setId(final String id) {
         this.id = id;
     }
 
-    @JsonProperty("request")
     public MulticloudInstanceRequest getRequest() {
         return request;
     }
 
-    @JsonProperty("request")
-    public void setRequest(MulticloudInstanceRequest request) {
+    public void setRequest(final MulticloudInstanceRequest request) {
         this.request = request;
     }
 
-    @JsonProperty("namespace")
     public String getNamespace() {
         return namespace;
     }
 
-    @JsonProperty("namespace")
-    public void setNamespace(String namespace) {
+    public void setNamespace(final String namespace) {
         this.namespace = namespace;
     }
 
-    @JsonProperty("resources")
     public List<Resource> getResources() {
         return resources;
     }
 
-    @JsonProperty("resources")
-    public void setResources(List<Resource> resources) {
+    public void setResources(final List<Resource> resources) {
         this.resources = resources;
     }
 
index f524aa9..0182fd5 100644 (file)
@@ -1,3 +1,20 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright 2021 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 package org.onap.so.multicloudsimulator.beans;
 
 import java.io.Serializable;
@@ -11,7 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonPropertyOrder({"template_type", "workload_id", "template_response", "workload_status_reason", "workload_status"})
+@JsonPropertyOrder({ "template_type", "workload_id", "template_response", "workload_status_reason", "workload_status" })
 public class MulticloudCreateResponse implements Serializable {
     private static final long serialVersionUID = -5215028275577848311L;
 
@@ -28,67 +45,57 @@ public class MulticloudCreateResponse implements Serializable {
 
     @JsonCreator
     public MulticloudCreateResponse(@JsonProperty("template_type") String templateType,
-                                    @JsonProperty("workload_id") String workloadId,
-                                    @JsonProperty("template_response") JsonNode templateResponse) {
+            @JsonProperty("workload_id") String workloadId,
+            @JsonProperty("template_response") JsonNode templateResponse) {
         this.templateType = templateType;
         this.workloadId = workloadId;
         this.templateResponse = templateResponse;
     }
+
     public MulticloudCreateResponse() {
 
     }
 
-    @JsonProperty("template_type")
     public String getTemplateType() {
         return templateType;
     }
 
-    @JsonProperty("template_type")
-    public void setTemplateType(String templateType) {
+    public void setTemplateType(final String templateType) {
         this.templateType = templateType;
     }
 
-    @JsonProperty("workload_id")
     public String getWorkloadId() {
         return workloadId;
     }
 
-    @JsonProperty("workload_id")
-    public void setWorkloadId(String workloadId) {
+    public void setWorkloadId(final String workloadId) {
         this.workloadId = workloadId;
     }
 
-    @JsonProperty("template_response")
-    public void setTemplateResponse(JsonNode templateResponse) {
+    public void setTemplateResponse(final JsonNode templateResponse) {
         this.templateResponse = templateResponse;
     }
 
-    @JsonProperty("template_response")
     public JsonNode getTemplateResponse() {
         return templateResponse;
     }
 
-    @JsonProperty("workload_status_reason")
-    public void setWorkloadStatusReason(JsonNode workloadStatusReason) {
+    public void setWorkloadStatusReason(final JsonNode workloadStatusReason) {
         this.workloadStatusReason = workloadStatusReason;
     }
 
-    @JsonProperty("workload_status_reason")
     public JsonNode getWorkloadStatusReason() {
         return workloadStatusReason;
     }
 
-    @JsonProperty("workload_status")
     public String getWorkloadSstatus() {
         return workloadStatus;
     }
 
-    @JsonProperty("workload_status")
-    public void setWorkloadStatus(String workloadStatus) {
+    public void setWorkloadStatus(final String workloadStatus) {
         this.workloadStatus = workloadStatus;
     }
 
-
     @Override
     public String toString() {
         return new ToStringBuilder(this).append("templateType", templateType).append("workloadId", workloadId)
index c88e7f1..b645b9b 100644 (file)
@@ -1,3 +1,20 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright 2021 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 package org.onap.so.multicloudsimulator.beans;
 
 import java.util.Map;
@@ -32,7 +49,7 @@ public class MulticloudInstanceRequest {
         return cloudRegion;
     }
 
-    public void setCloudRegion(String cloudRegion) {
+    public void setCloudRegion(final String cloudRegion) {
         this.cloudRegion = cloudRegion;
     }
 
@@ -40,7 +57,7 @@ public class MulticloudInstanceRequest {
         return rbName;
     }
 
-    public void setRbName(String rbName) {
+    public void setRbName(final String rbName) {
         this.rbName = rbName;
     }
 
@@ -48,7 +65,7 @@ public class MulticloudInstanceRequest {
         return rbVersion;
     }
 
-    public void setRbVersion(String rbVersion) {
+    public void setRbVersion(final String rbVersion) {
         this.rbVersion = rbVersion;
     }
 
@@ -56,7 +73,7 @@ public class MulticloudInstanceRequest {
         return profileName;
     }
 
-    public void setProfileName(String profileName) {
+    public void setProfileName(final String profileName) {
         this.profileName = profileName;
     }
 
@@ -80,7 +97,7 @@ public class MulticloudInstanceRequest {
         return vfModuleUuid;
     }
 
-    public void setVfModuleUuid(String vfModuleUuid) {
+    public void setVfModuleUuid(final String vfModuleUuid) {
         this.vfModuleUuid = vfModuleUuid;
     }
 
index c2ec191..baeebde 100644 (file)
@@ -1,8 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2019 Intel Corp. All rights reserved.
+ * Copyright 2021 Huawei Technologies Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,130 +27,119 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.woorea.openstack.heat.model.CreateStackParam;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"generic-vnf-id", "vf-module-id", "vf-module-model-invariant-id", "vf-module-model-version-id",
+@JsonPropertyOrder({ "generic-vnf-id", "vf-module-id", "vf-module-model-invariant-id", "vf-module-model-version-id",
         "vf-module-model-customization-id", "oof_directives", "sdnc_directives", "user_directives", "template_type",
-        "template_data"})
+        "template_data" })
 public class MulticloudRequest implements Serializable {
     private static final long serialVersionUID = -5215028275577848311L;
 
     @JsonProperty("generic-vnf-id")
     private String genericVnfId;
+
     @JsonProperty("vf-module-id")
     private String vfModuleId;
+
     @JsonProperty("vf-module-model-invariant-id")
     private String vfModuleModelInvariantId;
+
     @JsonProperty("vf-module-model-version-id")
     private String vfModuleModelVersionId;
+
     @JsonProperty("vf-module-model-customization-id")
     private String vfModuleModelCustomizationId;
+
     @JsonProperty("oof_directives")
     private JsonNode oofDirectives;
+
     @JsonProperty("sdnc_directives")
     private JsonNode sdncDirectives;
+
     @JsonProperty("user_directives")
     private JsonNode userDirectives;
+
     @JsonProperty("template_type")
     private String templateType;
+
     @JsonProperty("template_data")
     private CreateStackParam templateData;
 
-
-    @JsonProperty("generic-vnf-id")
     public String getGenericVnfId() {
         return genericVnfId;
     }
 
-    @JsonProperty("generic-vnf-id")
-    public void setGenericVnfId(String genericVnfId) {
+    public void setGenericVnfId(final String genericVnfId) {
         this.genericVnfId = genericVnfId;
     }
 
-    @JsonProperty("vf-module-id")
     public String getVfModuleId() {
         return vfModuleId;
     }
 
-    @JsonProperty("vf-module-id")
-    public void setVfModuleId(String vfModuleId) {
+    public void setVfModuleId(final String vfModuleId) {
         this.vfModuleId = vfModuleId;
     }
 
-    @JsonProperty("vf-module-model-invariant-id")
     public String getVfModuleModelInvariantId() {
         return vfModuleModelInvariantId;
     }
 
-    @JsonProperty("vf-module-model-invariant-id")
-    public void setVfModuleModelInvariantId(String vfModuleModelInvariantId) {
+    public void setVfModuleModelInvariantId(final String vfModuleModelInvariantId) {
         this.vfModuleModelInvariantId = vfModuleModelInvariantId;
     }
 
-    @JsonProperty("vf-module-model-version-id")
     public String getVfModuleModelVersionId() {
         return vfModuleModelVersionId;
     }
 
-    @JsonProperty("vf-module-model-version-id")
-    public void setVfModuleModelVersionId(String vfModuleModelVersionId) {
+    public void setVfModuleModelVersionId(final String vfModuleModelVersionId) {
         this.vfModuleModelVersionId = vfModuleModelVersionId;
     }
 
-    @JsonProperty("vf-module-model-customization-id")
     public String getVfModuleModelCustomizationId() {
         return vfModuleModelCustomizationId;
     }
 
     @JsonProperty("vf-module-model-customization-id")
-    public void setVfModuleModelCustomizationId(String vfModuleModelCustomizationId) {
+    public void setVfModuleModelCustomizationId(final String vfModuleModelCustomizationId) {
         this.vfModuleModelCustomizationId = vfModuleModelCustomizationId;
     }
 
-    @JsonProperty("oof_directives")
     public JsonNode getOofDirectives() {
         return oofDirectives;
     }
 
-    @JsonProperty("oof_directives")
-    public void setOofDirectives(JsonNode oofDirectives) {
+    public void setOofDirectives(final JsonNode oofDirectives) {
         this.oofDirectives = oofDirectives;
     }
 
-    @JsonProperty("sdnc_directives")
     public JsonNode getSdncDirectives() {
         return sdncDirectives;
     }
 
-    @JsonProperty("sdnc_directives")
-    public void setSdncDirectives(JsonNode sdncDirectives) {
+    public void setSdncDirectives(final JsonNode sdncDirectives) {
         this.sdncDirectives = sdncDirectives;
     }
 
-    @JsonProperty("user_directives")
     public JsonNode getUserDirectives() {
         return userDirectives;
     }
 
-    @JsonProperty("user_directives")
-    public void setUserDirectives(JsonNode userDirectives) {
+    public void setUserDirectives(final JsonNode userDirectives) {
         this.userDirectives = userDirectives;
     }
 
-    @JsonProperty("template_type")
     public String getTemplateType() {
         return templateType;
     }
 
-    @JsonProperty("template_type")
-    public void setTemplateType(String templateType) {
+    public void setTemplateType(final String templateType) {
         this.templateType = templateType;
     }
 
-    @JsonProperty("template_data")
     public CreateStackParam getTemplateData() {
         return templateData;
     }
 
-    @JsonProperty("template_data")
     public void setTemplateData(CreateStackParam templateData) {
         this.templateData = templateData;
     }
index 368ab6d..666cbe0 100644 (file)
@@ -1,15 +1,13 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright 2021 Huawei Technologies Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +15,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.so.multicloudsimulator.beans;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -25,11 +22,12 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"resource-type", "resource-link"})
+@JsonPropertyOrder({ "resource-type", "resource-link" })
 public class Resource {
 
     @JsonProperty("resource-type")
     private String resourceType;
+
     @JsonProperty("resource-link")
     private String resourceLink;
 
@@ -38,20 +36,16 @@ public class Resource {
         return resourceType;
     }
 
-    @JsonProperty("resource-type")
-    public void setResourceType(String resourceType) {
+    public void setResourceType(final String resourceType) {
         this.resourceType = resourceType;
     }
 
-    @JsonProperty("resource-link")
     public String getResourceLink() {
         return resourceLink;
     }
 
-    //@JsonProperty("resource-link")
-    public void setResourceLink(String resourceLink) {
+    public void setResourceLink(final String resourceLink) {
         this.resourceLink = resourceLink;
     }
 
 }
-
index 77a6150..8f0713e 100644 (file)
@@ -1,8 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright 2021 Huawei Technologies Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +22,10 @@ public class Response {
 
     private String errorMsg;
 
-    public Response(String errorMsg) {
+    public Response(final String errorMsg) {
         this.errorMsg = errorMsg;
     }
-    
+
     public Response() {
     }
 
@@ -35,7 +33,7 @@ public class Response {
         return errorMsg;
     }
 
-    public void setErrorMsg(String errorMsg) {
+    public void setErrorMsg(final String errorMsg) {
         this.errorMsg = errorMsg;
     }
 
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ * Copyright 2021 Huawei Technologies Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
-package org.onap.so.multicloudsimulator.configration;
+package org.onap.so.multicloudsimulator.configuration;
 
-import static org.onap.so.multicloudsimulator.utils.Constants.SERVICE_TOPOLOGY_OPERATION_CACHE;
+import static org.onap.so.multicloudsimulator.utils.Constants.MULTICLOUD_CACHE;
 import java.util.Arrays;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
@@ -28,17 +26,13 @@ import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
 @Configuration
-public class ApplicationConfigration {
+public class ApplicationConfiguration {
 
     @Bean
     public CacheManager cacheManager() {
         final SimpleCacheManager manager = new SimpleCacheManager();
-        manager.setCaches(Arrays.asList(getCache(SERVICE_TOPOLOGY_OPERATION_CACHE)));
+        manager.setCaches(Arrays.asList(getCache(MULTICLOUD_CACHE)));
         return manager;
     }
 
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ * Copyright 2021 Huawei Technologies Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
-package org.onap.so.multicloudsimulator.configration;
+package org.onap.so.multicloudsimulator.configuration;
 
 import static org.onap.so.multicloudsimulator.utils.Constants.OPERATIONS_URL;
 import org.onap.so.simulator.configuration.SimulatorSecurityConfigurer;
@@ -27,10 +25,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
 @Configuration
 @EnableWebSecurity
 public class WebSecurityConfigImpl extends SimulatorSecurityConfigurer {
index b0e1336..c99e246 100644 (file)
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright 2021 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 package org.onap.so.multicloudsimulator.controller;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.MediaType;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.onap.so.multicloudsimulator.beans.InstanceResponse;
-import org.onap.so.multicloudsimulator.beans.MulticloudInstanceRequest;
+import org.apache.commons.io.IOUtils;
+import org.onap.so.multicloudsimulator.beans.InstanceOutput;
 import org.onap.so.multicloudsimulator.beans.MulticloudCreateResponse;
+import org.onap.so.multicloudsimulator.beans.MulticloudInstanceRequest;
+import org.onap.so.multicloudsimulator.beans.InstanceResponse;
+import org.onap.so.multicloudsimulator.beans.InstanceNameOutput;
 import org.onap.so.multicloudsimulator.beans.MulticloudRequest;
-import org.onap.so.openstack.beans.HeatStatus;
 
 import org.springframework.http.ResponseEntity;
-
-import org.springframework.web.bind.annotation.*;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
-import java.net.URI;
+import java.io.InputStream;
 
 import static org.onap.so.multicloudsimulator.utils.Constants.BASE_URL;
+
 @RestController
 @RequestMapping(path = BASE_URL)
 public class MultiCloudController {
 
-       public static final String X_HTTP_METHOD_OVERRIDE = "X-HTTP-Method-Override";
-       private static final Logger LOGGER = LoggerFactory.getLogger(MultiCloudController.class);
-       public MulticloudCreateResponse multicloudCreateResponse = new MulticloudCreateResponse();
-
-       @PostMapping(value="/v1/instance")
-       public ResponseEntity<?> createInstance(@RequestBody MulticloudInstanceRequest req){
-          System.out.println("MultiCloud createInstance ");
-               InstanceResponse InstanceResponse = new InstanceResponse();
-               
-               return ResponseEntity.ok(InstanceResponse);
-       }
-       
-       @GetMapping(value = "/{cloud-owner}/{cloud-region-id}/infra_workload", produces = {
-                       MediaType.APPLICATION_JSON })
-    public ResponseEntity<?> getInstance(
-               @PathVariable("cloud-owner") String cloudOwner, @PathVariable("cloud-region-id") String cloudRegionId,
-               @RequestParam(value = "depth", required = false, defaultValue = "0") Integer depth,
-               @RequestParam(name = "format", required = false) final String name, final HttpServletRequest request) throws IOException {
-               
-               LOGGER.info("found CloudOwner {} in cache", cloudOwner);
-               LOGGER.info("found cloudRegionId {} in cache", cloudRegionId);
-               LOGGER.info("found name {} in cache", name);
-                       JSONObject json = new JSONObject();
-
-                       json.put("template_type", "heat");
-                       json.put("workload_id", "");
-                       json.put("workload_status", "GET_COMPLETE");
-                       JSONObject workload = new JSONObject();
-                       workload.put("stacks", HeatStatus.NOTFOUND);
-                       json.put("workload_status_reason", workload);
-
-                       return ResponseEntity.ok(json);
-       }
-
-       @PostMapping(value = "/{cloud-owner}/{cloud-region-id}/infra_workload",
-                       consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-                       produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-       public ResponseEntity<?> postCreateInstance(
-                       @RequestBody final MulticloudRequest inputRequest, @PathVariable("cloud-owner") final String cloudOwner,
-                       @PathVariable("cloud-region-id") final String cloudRegionId,
-                       @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String xHttpHeaderOverride,
-                       final HttpServletRequest request) throws IOException {
-
-                       LOGGER.info("input request {}: ",inputRequest.toString());
-               String input = "{\n" +
-                               "   \"template_type\": \"heat\",\n" +
-                               "   \"workload_id\": \"sad_sammet\",\n" +
-                               "   \"template_response\": [\n" +
-                               "      {\n" +
-                               "         \"GVK\": {\n" +
-                               "            \"Group\": \"k8s.plugin.opnfv.org\",\n" +
-                               "            \"Version\": \"v1alpha1\",\n" +
-                               "            \"Kind\": \"Network\"\n" +
-                               "         },\n" +
-                               "         \"Name\": \"k8s-region-2-onap-nf-20210120t221126760z-management-network\"\n" +
-                               "      },\n" +
-                               "      {\n" +
-                               "         \"GVK\": {\n" +
-                               "            \"Group\": \"k8s.plugin.opnfv.org\",\n" +
-                               "            \"Version\": \"v1alpha1\",\n" +
-                               "            \"Kind\": \"Network\"\n" +
-                               "         },\n" +
-                               "         \"Name\": \"k8s-region-2-onap-nf-20210120t221126760z-protected-network\"\n" +
-                               "      },\n" +
-                               "      {\n" +
-                               "         \"GVK\": {\n" +
-                               "            \"Group\": \"k8s.plugin.opnfv.org\",\n" +
-                               "            \"Version\": \"v1alpha1\",\n" +
-                               "            \"Kind\": \"Network\"\n" +
-                               "         },\n" +
-                               "         \"Name\": \"k8s-region-2-onap-nf-20210120t221126760z-unprotected-network\"\n" +
-                               "      },\n" +
-                               "      {\n" +
-                               "         \"GVK\": {\n" +
-                               "            \"Group\": \"k8s.cni.cncf.io\",\n" +
-                               "            \"Version\": \"v1\",\n" +
-                               "            \"Kind\": \"NetworkAttachmentDefinition\"\n" +
-                               "         },\n" +
-                               "         \"Name\": \"k8s-region-2-onap-nf-20210120t221126760z-ovn-nat\"\n" +
-                               "      }\n" +
-                               "   ],\n" +
-                               "   \"workload_status\": \"CREATE_COMPLETE\",\n" +
-                               "   \"workload_status_reason\": \"test\"\n" +
-                               "}";
-
-               ObjectMapper objectMapper = new ObjectMapper();
-               JSONObject workload = new JSONObject();
-
-               workload.put("stack",true);
-
-               JsonNode jsonNode = objectMapper.readTree(workload.toJSONString());
-               MulticloudCreateResponse multiResponse = objectMapper.readValue(input, MulticloudCreateResponse.class);
-               multiResponse.setWorkloadStatusReason(null);
-
-               LOGGER.info("workload reason: {}",multiResponse.getWorkloadStatusReason());
-               multiResponse.setWorkloadId("sad_sammet");
-               multiResponse.setTemplateType("heat");
-               multiResponse.setWorkloadStatus("CREATE_COMPLETE");
-
-               return ResponseEntity.status(201).body(multiResponse);
-       }
-
-       @GetMapping(value = "/{cloud-owner}/{cloud-region-id}/infra_workload/{workload-id}", produces = {
-                       MediaType.APPLICATION_JSON })
-       public ResponseEntity<?> getInstanceName(
-                       @PathVariable("cloud-owner") String cloudOwner, @PathVariable("cloud-region-id") String cloudRegionId,
-                       @PathVariable("workload-id") String workloadId,
-                       @RequestParam(value = "depth", required = false, defaultValue = "0") Integer depth,
-                       @RequestParam(name = "format", required = false) final String name, final HttpServletRequest request) throws IOException {
-
-               LOGGER.info("Calling getInstanceName");
-               LOGGER.info("found CloudOwner {} in cache", cloudOwner);
-               LOGGER.info("found cloudRegionId {} in cache", cloudRegionId);
-               LOGGER.info("found name {} in cache", name);
-               JSONObject json = new JSONObject();
-
-                       json.put("template_type", "heat");
-                       json.put("workload_id", "sad_sammet");
-                       json.put("workload_status", "CREATE_COMPLETE");
-                       JSONObject workload = new JSONObject();
-                       workload.put("stacks", true);
-                       json.put("workload_status_reason", null);
-
-                       return ResponseEntity.ok(json);
-       }
-
-       @PostMapping(value = "/{cloud-owner}/{cloud-region-id}/infra_workload/{workload-id}",
-                       consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-                       produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-       public ResponseEntity<?> postCreateInstanceName(
-                       @RequestBody final MulticloudRequest inputRequest, @PathVariable("cloud-owner") final String cloudOwner,
-                       @PathVariable("workload-id") String workloadId,
-                       @PathVariable("cloud-region-id") final String cloudRegionId,
-                       @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String xHttpHeaderOverride,
-                       final HttpServletRequest request) throws IOException {
-
-                       LOGGER.info("Calling postCreateInstanceName");
-
-                       return ResponseEntity.status(405).build();
-       }
-}
+    public static final String X_HTTP_METHOD_OVERRIDE = "X-HTTP-Method-Override";
+    private static final Logger LOGGER = LoggerFactory.getLogger(MultiCloudController.class);
+
+    @PostMapping(value = "/v1/instance")
+    public ResponseEntity<?> createInstance(@RequestBody MulticloudInstanceRequest req) {
+        System.out.println("MultiCloud createInstance ");
+        final InstanceResponse InstanceResponse = new InstanceResponse();
+
+        LOGGER.info("Calling createInstance");
+        return ResponseEntity.ok(InstanceResponse);
+    }
+
+    @GetMapping(value = "/{cloud-owner}/{cloud-region-id}/infra_workload", produces = { MediaType.APPLICATION_JSON })
+    public ResponseEntity<?> getInstance(@PathVariable("cloud-owner") String cloudOwner,
+            @PathVariable("cloud-region-id") String cloudRegionId,
+            @RequestParam(value = "depth", required = false, defaultValue = "0") Integer depth,
+            @RequestParam(name = "format", required = false) final String name, final HttpServletRequest request)
+            throws Exception {
+
+        LOGGER.info("found CloudOwner {}", cloudOwner);
+        LOGGER.info("found cloudRegionId {}", cloudRegionId);
+        LOGGER.info("found name {}", name);
+        final InputStream instanceOutput = InstanceOutput.getInstance();
+        final String output = IOUtils.toString(instanceOutput, "utf-8");
+
+        return ResponseEntity.ok(output);
+    }
+
+    @PostMapping(value = "/{cloud-owner}/{cloud-region-id}/infra_workload", consumes = { MediaType.APPLICATION_JSON,
+            MediaType.APPLICATION_XML }, produces = { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+    public ResponseEntity<?> postCreateInstance(@RequestBody final MulticloudCreateResponse inputRequest,
+            @PathVariable("cloud-owner") final String cloudOwner,
+            @PathVariable("cloud-region-id") final String cloudRegionId,
+            @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String xHttpHeaderOverride,
+            final HttpServletRequest request) throws IOException {
+
+        LOGGER.info("Calling postCreateInstance");
+        inputRequest.setWorkloadStatusReason(null);
+
+        inputRequest.setWorkloadId("sad_sammet");
+        inputRequest.setTemplateType("heat");
+        inputRequest.setWorkloadStatus("CREATE_COMPLETE");
+
+        return ResponseEntity.status(201).body(inputRequest);
+    }
+
+    @GetMapping(value = "/{cloud-owner}/{cloud-region-id}/infra_workload/{workload-id}", produces = {
+            MediaType.APPLICATION_JSON })
+    public ResponseEntity<?> getInstanceName(@PathVariable("cloud-owner") final String cloudOwner,
+            @PathVariable("cloud-region-id") final String cloudRegionId, @PathVariable("workload-id") final String workloadId,
+            @RequestParam(value = "depth", required = false, defaultValue = "0") final Integer depth,
+            @RequestParam(name = "format", required = false) final String name, final HttpServletRequest request)
+            throws Exception {
+
+        LOGGER.info("Calling getInstanceName");
+        LOGGER.info("found CloudOwner {}", cloudOwner);
+        LOGGER.info("found cloudRegionId {}", cloudRegionId);
+        LOGGER.info("found name {}", name);
+        final InputStream instanceNameOutput = InstanceNameOutput.getInstanceName();
+        final String output = IOUtils.toString(instanceNameOutput, "utf-8");
+
+        return ResponseEntity.ok(output);
+    }
+
+    @PostMapping(value = "/{cloud-owner}/{cloud-region-id}/infra_workload/{workload-id}", consumes = {
+            MediaType.APPLICATION_JSON,
+            MediaType.APPLICATION_XML }, produces = { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+    public ResponseEntity<?> postCreateInstanceName(@RequestBody final MulticloudRequest inputRequest,
+            @PathVariable("cloud-owner") final String cloudOwner, @PathVariable("workload-id") String workloadId,
+            @PathVariable("cloud-region-id") final String cloudRegionId,
+            @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String xHttpHeaderOverride,
+            final HttpServletRequest request) throws IOException {
+
+        LOGGER.info("Calling postCreateInstanceName");
+
+        return ResponseEntity.status(405).build();
+    }
+}
\ No newline at end of file
index 5f54f5d..e104d23 100644 (file)
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ * Copyright 2021 Huawei Technologies Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
 package org.onap.so.multicloudsimulator.utils;
 
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
 public class Constants {
 
     public static final String BASE_URL = "/api/multicloud/v1";
 
     public static final String OPERATIONS_URL = BASE_URL + "/operations";
 
-    public static final String SERVICE_TOPOLOGY_OPERATION_CACHE = "service-topology-operation-cache";
-
-    public static final String HEALTHY = "healthy";
-
-    public static final String YES = "Y";
-
-    public static final String SERVICE_TOPOLOGY_OPERATION = "service-topology-operation";
-
-    public static final String RESTCONF_CONFIG_END_POINT = "restconf/config/GENERIC-RESOURCE-API:services/service/";
-
-    public static final String VNF_DATA_VNF_TOPOLOGY = "/vnf-data/vnf-topology/";
-
-    public static final String SERVICE_DATA_VNFS_VNF = "/service-data/vnfs/vnf/";
+    public static final String MULTICLOUD_CACHE = "multicloud-cache";
 
-    private Constants() {}
+    private Constants() {
+    }
 }
index 7299ff9..393d1b7 100644 (file)
@@ -7,11 +7,9 @@ spring:
    security:
       users:
       -  username: mso
-         #password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
          password: $2a$04$f8SB6cW/VI26QvYM6z.GXu7hlEmwnFtePenD8zF18mS3Atu3QNqr2
          role: VID
       -  username: admin
-         #password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
          password: $2a$04$f8SB6cW/VI26QvYM6z.GXu7hlEmwnFtePenD8zF18mS3Atu3QNqr2
          role: VID
    main:
diff --git a/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/resources/data/InstanceNameOutput.json b/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/resources/data/InstanceNameOutput.json
new file mode 100644 (file)
index 0000000..8c0e88f
--- /dev/null
@@ -0,0 +1,6 @@
+{
+  "workload_status_reason": null,
+  "template_type": "heat",
+  "workload_id": "sad_sammet",
+  "workload_status": "CREATE_COMPLETE"
+}
\ No newline at end of file
diff --git a/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/resources/data/InstanceOutput.json b/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/resources/data/InstanceOutput.json
new file mode 100644 (file)
index 0000000..e47ffb4
--- /dev/null
@@ -0,0 +1,8 @@
+{
+    "workload_status_reason": {
+        "stacks": "NOTFOUND"
+    },
+    "template_type": "heat",
+    "workload_id": "",
+    "workload_status": "GET_COMPLETE"
+}
index ccce88c..d9b10d4 100644 (file)
@@ -1,13 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright 2021 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 package org.onap.so.multicloudsimulator;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.so.multicloudsimulator.utils.Constants;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@SpringBootTest
+import static org.junit.Assert.assertEquals;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ActiveProfiles("test")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Configuration
 class MultiCloudSimulatorApplicationTests {
+    @LocalServerPort
+    private int port;
+
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @Test
+    public void test_createInstance() {
+        final String url = "http://localhost:" + port + Constants.BASE_URL + "/operations";
+
+        final ResponseEntity<String> object = restTemplate.getForEntity(url, String.class);
+
+        assertEquals(Constants.OPERATIONS_URL, object.getBody());
 
-       @Test
-       void contextLoads() {
-       }
+    }
 
-}
+}
\ No newline at end of file
diff --git a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/ConfigController.java b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/ConfigController.java
new file mode 100644 (file)
index 0000000..7282e05
--- /dev/null
@@ -0,0 +1,94 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright 2021 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdncsimulator.controller;
+
+import static org.onap.so.sdncsimulator.utils.Constants.BASE_URL;
+import java.util.Optional;
+import javax.ws.rs.core.MediaType;
+import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfTopology;
+import org.onap.sdnc.northbound.client.model.GenericResourceApiVfModuleTopology;
+
+import org.onap.so.sdncsimulator.providers.ServiceOperationsCacheServiceProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author Md Irshad Sheikh (md.irshad.sheikh@huawei.com)
+ *
+ */
+@Controller
+@RequestMapping(path = BASE_URL)
+public class ConfigController {
+    private static final String HTTP_STATUS_OK = HttpStatus.OK.value() + "";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OperationsController.class);
+
+    private final ServiceOperationsCacheServiceProvider cacheServiceProvider;
+
+    @Autowired
+    public ConfigController(final ServiceOperationsCacheServiceProvider cacheServiceProvider) {
+        this.cacheServiceProvider = cacheServiceProvider;
+    }
+
+    @GetMapping(value = "/config/GENERIC-RESOURCE-API:services/service/{service-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/")
+    public ResponseEntity<?> getVNf(@PathVariable("service-id") String serviceId,
+                                    @PathVariable("vnf-id") String vnfId) {
+
+        LOGGER.info("Get vnf-topology with serviceId {} and vnfId {}",serviceId, vnfId);
+        final Optional<GenericResourceApiVnfTopology> optional =
+                cacheServiceProvider.getGenericResourceApiVnfTopology(vnfId);
+        if (optional.isPresent()) {
+            final GenericResourceApiVnfTopology genericVnfTopology = optional.get();
+            LOGGER.info("found VnfTopology {} in cache", genericVnfTopology);
+            return ResponseEntity.ok(genericVnfTopology);
+        }
+
+        LOGGER.error(
+                "Unable to find VnfTopology in cache ");
+
+        return ResponseEntity.badRequest().build();
+    }
+
+    @GetMapping(value = "/config/GENERIC-RESOURCE-API:services/service/{service-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/", produces = {
+            MediaType.APPLICATION_JSON })
+    public ResponseEntity<?> getVFmodule(@PathVariable("service-id") String serviceId,
+                                         @PathVariable("vnf-id") String vnfId, @PathVariable("vf-module-id") String vfModuleId) {
+        LOGGER.info("Get vfModule-topology with serviceId {}, vnfId {} and vfModuleId {}",serviceId, vnfId,vfModuleId);
+
+        final Optional<GenericResourceApiVfModuleTopology> optional =
+                cacheServiceProvider.getGenericResourceApiVfModuleTopology(vfModuleId);
+
+        if (optional.isPresent()) {
+            final GenericResourceApiVfModuleTopology vfModuleTopology = optional.get();
+            LOGGER.info("found vfModuleTopology {} in cache", vfModuleTopology);
+            return ResponseEntity.ok(vfModuleTopology);
+        }
+
+        LOGGER.error(
+                "Unable to find VfModuleTopology in cache for ");
+
+        return ResponseEntity.badRequest().build();
+    }
+}
index 6077bdd..58f9038 100644 (file)
@@ -23,15 +23,8 @@ import static org.onap.sdnc.northbound.client.model.GenericResourceApiRequestAct
 import static org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration.DELETEVNFINSTANCE;
 import static org.onap.sdnc.northbound.client.model.GenericResourceApiSvcActionEnumeration.DELETE;
 import static org.onap.so.sdncsimulator.utils.Constants.OPERATIONS_URL;
-import static org.onap.so.sdncsimulator.utils.Constants.BASE_URL;
-import static org.onap.so.sdncsimulator.utils.Constants.RESTCONF_CONFIG_END_POINT;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.MediaType;
-
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestinformationRequestInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiSdncrequestheaderSdncRequestHeader;
@@ -39,8 +32,6 @@ import org.onap.sdnc.northbound.client.model.GenericResourceApiServiceOperationI
 import org.onap.sdnc.northbound.client.model.GenericResourceApiSvcActionEnumeration;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfOperationInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVfModuleOperationInformation;
-import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfTopology;
-import org.onap.sdnc.northbound.client.model.GenericResourceApiVfModuleTopology;
 import org.onap.so.sdncsimulator.models.InputRequest;
 import org.onap.so.sdncsimulator.models.Output;
 import org.onap.so.sdncsimulator.models.OutputRequest;
@@ -51,8 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -62,7 +51,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  *
  */
 @Controller
-@RequestMapping(path = BASE_URL)
+@RequestMapping(path = OPERATIONS_URL)
 public class OperationsController {
     private static final String HTTP_STATUS_OK = HttpStatus.OK.value() + "";
 
@@ -75,7 +64,7 @@ public class OperationsController {
         this.cacheServiceProvider = cacheServiceProvider;
     }
 
-    @PostMapping(value = "/operations/GENERIC-RESOURCE-API:service-topology-operation/",
+    @PostMapping(value = "/GENERIC-RESOURCE-API:service-topology-operation/",
             consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
             produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ResponseEntity<?> postServiceOperationInformation(
@@ -102,7 +91,7 @@ public class OperationsController {
 
     }
 
-    @PostMapping(value = "/operations/GENERIC-RESOURCE-API:vnf-topology-operation/",
+    @PostMapping(value = "/GENERIC-RESOURCE-API:vnf-topology-operation/",
             consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
             produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ResponseEntity<?> postVnfOperationInformation(
@@ -159,7 +148,7 @@ public class OperationsController {
         return cacheServiceProvider.putVnfOperationInformation(apiVnfOperationInformation);
     }
 
-    @PostMapping(value = "/operations/GENERIC-RESOURCE-API:vf-module-topology-operation/",
+    @PostMapping(value = "/GENERIC-RESOURCE-API:vf-module-topology-operation/",
             consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
             produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ResponseEntity<?> postVfModuleOperationInformation(
@@ -167,13 +156,13 @@ public class OperationsController {
             final HttpServletRequest request) {
         LOGGER.info("Request Received for VfModule : {}  ...", inputRequest);
 
-        final GenericResourceApiVfModuleOperationInformation apiVfModuleperationInformation = inputRequest.getInput();
-        if (apiVfModuleperationInformation == null) {
+        final GenericResourceApiVfModuleOperationInformation apiVfModuleOperationInformation = inputRequest.getInput();
+        if (apiVfModuleOperationInformation == null) {
             LOGGER.error("Invalid input request: {}", inputRequest);
             return ResponseEntity.badRequest().build();
         }
 
-        final Output output = getOutput(apiVfModuleperationInformation);
+        final Output output = getOutput(apiVfModuleOperationInformation);
         final OutputRequest outputRequest = new OutputRequest(output);
 
         if (output.getResponseCode().equals(HTTP_STATUS_OK)) {
@@ -191,28 +180,4 @@ public class OperationsController {
         return cacheServiceProvider.putVfModuleOperationInformation(apiVfModuleOperationInformation);
     }
 
-    
-    @GetMapping(value = "/config/GENERIC-RESOURCE-API:services/service/{service-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/")
-       public ResponseEntity<?> getVNf(@PathVariable("service-id") String serviceId,
-                       @PathVariable("vnf-id") String vnfId) {
-
-       LOGGER.info("Get vnf-topology with serviceId {} and vnfId {}",serviceId, vnfId);
-               GenericResourceApiVnfTopology genericResourceApiVnfTopology = new GenericResourceApiVnfTopology();
-               
-               genericResourceApiVnfTopology = cacheServiceProvider.getGenericResourceApiVnfTopology();
-               return ResponseEntity.ok(genericResourceApiVnfTopology);
-       }
-
-       @GetMapping(value = "/config/GENERIC-RESOURCE-API:services/service/{service-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/", produces = {
-                       MediaType.APPLICATION_JSON })
-       public ResponseEntity<?> getVFmodule(@PathVariable("service-id") String serviceId,
-                       @PathVariable("vnf-id") String vnfId, @PathVariable("vf-module-id") String vfModuleId) {
-               LOGGER.info("Get vfModule-topology with serviceId {}, vnfId {} and vfModuleId {}",serviceId, vnfId,vfModuleId);
-
-               GenericResourceApiVfModuleTopology genericResourceApiVfModuleTopology = new GenericResourceApiVfModuleTopology();
-
-               genericResourceApiVfModuleTopology = cacheServiceProvider.getGenericResourceApiVfModuleTopology();
-               return ResponseEntity.ok(genericResourceApiVfModuleTopology);
-
-       }
 }
index d7dbec8..13e1d43 100644 (file)
@@ -19,7 +19,6 @@
  */
 package org.onap.so.sdncsimulator.providers;
 
-import java.util.List;
 import java.util.Optional;
 
 import org.onap.sdnc.northbound.client.model.GenericResourceApiServiceOperationInformation;
@@ -51,9 +50,10 @@ public interface ServiceOperationsCacheServiceProvider {
 
     Output putVfModuleOperationInformation(final GenericResourceApiVfModuleOperationInformation apiVfModuleOperationInformation);
 
-    public GenericResourceApiVfModuleTopology getGenericResourceApiVfModuleTopology();
+    public Optional<GenericResourceApiVfModuleTopology> getGenericResourceApiVfModuleTopology(final String vfModueId);
 
-    public GenericResourceApiVnfTopology getGenericResourceApiVnfTopology();
+    public Optional<GenericResourceApiVnfTopology> getGenericResourceApiVnfTopology(final String vnfId);
 
     void clearAll();
+
 }
\ No newline at end of file
index 90255de..4c69a01 100644 (file)
@@ -36,7 +36,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import javax.validation.Valid;
-
 import org.onap.sdnc.northbound.client.model.GenericResourceApiInstanceReference;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiLastActionEnumeration;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiLastRpcActionEnumeration;
@@ -73,6 +72,7 @@ import org.onap.sdnc.northbound.client.model.GenericResourceApiParam;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiParamParam;
 
 import org.onap.so.sdncsimulator.models.Output;
+import org.onap.so.sdncsimulator.utils.Constants;
 import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,9 +94,6 @@ public class ServiceOperationsCacheServiceProviderimpl extends AbstractCacheServ
     private static final String HTTP_STATUS_OK = Integer.toString(HttpStatus.OK.value());
     private static final String EMPTY_STRING = "";
     private static final Logger LOGGER = LoggerFactory.getLogger(ServiceOperationsCacheServiceProviderimpl.class);
-    private static List<GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfmoduleVfModuleData> vfModuleList;
-    GenericResourceApiVfModuleTopology genericResourceApiVfModuleTopology = new GenericResourceApiVfModuleTopology();
-    GenericResourceApiVnfTopology genericResourceApiVnfTopology = new GenericResourceApiVnfTopology();
 
     @Autowired
     public ServiceOperationsCacheServiceProviderimpl(final CacheManager cacheManager) {
@@ -213,7 +210,7 @@ public class ServiceOperationsCacheServiceProviderimpl extends AbstractCacheServ
 
                     if (ifVnfNotExists(vnfId, svcAction, vnfsList)) {
                         vnfsList.add(getGenericResourceApiServicedataVnf(serviceInstanceId, vnfId, input));
-                        getVnfsList(vnfsList);
+                        setVnfsData(vnfsList);
                         final GenericResourceApiServicestatusServiceStatus serviceStatus = service.getServiceStatus();
 
                         return new Output().ackFinalIndicator(serviceStatus.getFinalIndicator())
@@ -522,15 +519,15 @@ public class ServiceOperationsCacheServiceProviderimpl extends AbstractCacheServ
 
     }
 
-       @Override
-       public Output putVfModuleOperationInformation(
-                       GenericResourceApiVfModuleOperationInformation input) {
+    @Override
+    public Output putVfModuleOperationInformation(
+            final GenericResourceApiVfModuleOperationInformation input) {
 
-               final GenericResourceApiServiceinformationServiceInformation serviceInformation = input.getServiceInformation();
+        final GenericResourceApiServiceinformationServiceInformation serviceInformation = input.getServiceInformation();
         final GenericResourceApiVnfinformationVnfInformation vnfInformation = input.getVnfInformation();
         final GenericResourceApiVfmoduleinformationVfModuleInformation vfModuleInformation = input.getVfModuleInformation();
         // Call getVfModule to make a vfList for get the vf-module-information while GET reqest
-        vfModuleList = getVfModule(input);
+        getVfModule(input);
 
         final GenericResourceApiSdncrequestheaderSdncRequestHeader requestHeader = input.getSdncRequestHeader();
         final String svcRequestId = getSvcRequestId(requestHeader);
@@ -549,18 +546,18 @@ public class ServiceOperationsCacheServiceProviderimpl extends AbstractCacheServ
                 final GenericResourceApiServicemodelinfrastructureService service = optional.get();
                 final GenericResourceApiServicedataServiceData serviceData = service.getServiceData();
                 if (serviceData != null) {
-                  
-                        final GenericResourceApiServicestatusServiceStatus serviceStatus = service.getServiceStatus();
 
-                        return new Output().ackFinalIndicator(serviceStatus.getFinalIndicator())
-                                .responseCode(serviceStatus.getResponseCode())
-                                .responseMessage(serviceStatus.getResponseMessage()).svcRequestId(svcRequestId)
-                                .serviceResponseInformation(new GenericResourceApiInstanceReference()
-                                        .instanceId(serviceInstanceId).objectPath(getObjectPath(serviceInstanceId)))
-                                .vnfResponseInformation(new GenericResourceApiInstanceReference().instanceId(vnfId)
-                                        .objectPath(getObjectPath(serviceInstanceId, vnfId)))
-                                .vfModuleResponseInformation(new GenericResourceApiInstanceReference().instanceId(vfModuleId)
-                                               .objectPath(getObjectPath(vnfId, vfModuleId)));
+                    final GenericResourceApiServicestatusServiceStatus serviceStatus = service.getServiceStatus();
+
+                    return new Output().ackFinalIndicator(serviceStatus.getFinalIndicator())
+                            .responseCode(serviceStatus.getResponseCode())
+                            .responseMessage(serviceStatus.getResponseMessage()).svcRequestId(svcRequestId)
+                            .serviceResponseInformation(new GenericResourceApiInstanceReference()
+                                    .instanceId(serviceInstanceId).objectPath(getObjectPath(serviceInstanceId)))
+                            .vnfResponseInformation(new GenericResourceApiInstanceReference().instanceId(vnfId)
+                                    .objectPath(getObjectPath(serviceInstanceId, vnfId)))
+                            .vfModuleResponseInformation(new GenericResourceApiInstanceReference().instanceId(vfModuleId)
+                                    .objectPath(getObjectPath(vnfId, vfModuleId)));
                 }
             }
             LOGGER.error(
@@ -572,69 +569,82 @@ public class ServiceOperationsCacheServiceProviderimpl extends AbstractCacheServ
                 input);
         return new Output().ackFinalIndicator(YES).responseCode(HTTP_STATUS_BAD_REQUEST)
                 .responseMessage("Unable to add vfModule").svcRequestId(svcRequestId);
-       }
+    }
 
-    private List<GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfmoduleVfModuleData> getVfModule(GenericResourceApiVfModuleOperationInformation input) {
-        
-       final GenericResourceApiVfmoduletopologyVfModuleTopology apiVfModuletopologyVfModuleTopology =
+    private void getVfModule
+            (final GenericResourceApiVfModuleOperationInformation input) {
+
+        final GenericResourceApiVfmoduletopologyVfModuleTopology apiVfModuletopologyVfModuleTopology =
                 new GenericResourceApiVfmoduletopologyVfModuleTopology();
-       
-       GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfmoduleVfModuleData vfModuleData =
+
+        final GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfmoduleVfModuleData vfModuleData =
                 new GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfmoduleVfModuleData();
+
+        final String vfModuleId = input.getVfModuleInformation().getVfModuleId();
+
         vfModuleData.setVfModuleInformation(input.getVfModuleInformation());
         vfModuleData.setVfModuleRequestInput(input.getVfModuleRequestInput());
-               GenericResourceApiVfmoduletopologyVfModuleTopology vfModuleTopology = new GenericResourceApiVfmoduletopologyVfModuleTopology();
-               
-               vfModuleTopology.setSdncGeneratedCloudResources(true);
-               GenericResourceApiParam vfModuleParametersData = new GenericResourceApiParam();
-               List<GenericResourceApiParamParam> params = new ArrayList<GenericResourceApiParamParam>();
-               GenericResourceApiParamParam param = new GenericResourceApiParamParam();
-               param.setName("k8s-rb-profile-name");
-               param.setValue("k8s-rb-profile-value");
-       
-               params.add(param);
-               vfModuleParametersData.setParam(params);
-               vfModuleTopology.setVfModuleParameters(vfModuleParametersData);
-        
+
+        final GenericResourceApiVfmoduletopologyVfModuleTopology vfModuleTopology =
+                new GenericResourceApiVfmoduletopologyVfModuleTopology();
+
+        vfModuleTopology.setSdncGeneratedCloudResources(true);
+        final GenericResourceApiParam vfModuleParametersData = new GenericResourceApiParam();
+        final List<GenericResourceApiParamParam> params = new ArrayList<GenericResourceApiParamParam>();
+        final GenericResourceApiParamParam param = new GenericResourceApiParamParam();
+        param.setName("k8s-rb-profile-name");
+        param.setValue("k8s-rb-profile-value");
+
+        params.add(param);
+        vfModuleParametersData.setParam(params);
+        vfModuleTopology.setVfModuleParameters(vfModuleParametersData);
+
         vfModuleTopology.setOnapModelInformation(vfModuleData.getVfModuleInformation().getOnapModelInformation());
         vfModuleTopology.setVfModuleParameters(vfModuleData.getVfModuleRequestInput().getVfModuleInputParameters());
         vfModuleTopology.setAicClli(vfModuleData.getVfModuleRequestInput().getAicClli());
         vfModuleTopology.setAicCloudRegion(vfModuleData.getVfModuleRequestInput().getAicCloudRegion());
         vfModuleTopology.setCloudOwner(vfModuleData.getVfModuleRequestInput().getCloudOwner());
-        
+
         apiVfModuletopologyVfModuleTopology.vfModuleTopologyIdentifier(getVfModuleTopologyIdentifierStructure(input));
-        
+
         vfModuleTopology.setVfModuleTopologyIdentifier(apiVfModuletopologyVfModuleTopology.getVfModuleTopologyIdentifier());
         vfModuleTopology.setTenant(vfModuleData.getVfModuleRequestInput().getTenant());
 
+        final GenericResourceApiVfModuleTopology genericResourceApiVfModuleTopology = new GenericResourceApiVfModuleTopology();
         genericResourceApiVfModuleTopology.setVfModuleTopology(vfModuleTopology);
-   
-       return null;
 
+        final Cache cache = getCache(Constants.SERVICE_TOPOLOGY_OPERATION_CACHE);
+        cache.put(vfModuleId, genericResourceApiVfModuleTopology);
     }
 
-       public GenericResourceApiVfModuleTopology getGenericResourceApiVfModuleTopology() {
-               return genericResourceApiVfModuleTopology;
-       }
-       
-       private GenericResourceApiVfmoduletopologyidentifierVfModuleTopologyIdentifier getVfModuleTopologyIdentifierStructure(
+    @Override
+    public Optional<GenericResourceApiVfModuleTopology> getGenericResourceApiVfModuleTopology(final String vfModueId) {
+        LOGGER.info("getting GenericResourceApiVfModuleTopology from cache using key: {}", vfModueId);
+        final Cache cache = getCache(Constants.SERVICE_TOPOLOGY_OPERATION_CACHE);
+        final GenericResourceApiVfModuleTopology value =
+                cache.get(vfModueId, GenericResourceApiVfModuleTopology.class);
+        if (value != null) {
+            return Optional.of(value);
+        }
+        LOGGER.error("Unable to find GenericResourceApiVfModuleTopology ...");
+        return Optional.empty();
+    }
+
+    private GenericResourceApiVfmoduletopologyidentifierVfModuleTopologyIdentifier getVfModuleTopologyIdentifierStructure(
             @Valid final GenericResourceApiVfModuleOperationInformation input) {
-               
-               final GenericResourceApiVfmoduleinformationVfModuleInformation vfModuleInformation = input.getVfModuleInformation();
+
+        final GenericResourceApiVfmoduleinformationVfModuleInformation vfModuleInformation = input.getVfModuleInformation();
         return new GenericResourceApiVfmoduletopologyidentifierVfModuleTopologyIdentifier()
                 .vfModuleId(vfModuleInformation.getVfModuleId()).vfModuleType(vfModuleInformation.getVfModuleType()).vfModuleName(input.getVfModuleRequestInput().getVfModuleName());
     }
-       
-       public GenericResourceApiVnfTopology getGenericResourceApiVnfTopology() {
-               return genericResourceApiVnfTopology;
-       }
 
-       public void getVnfsList(List<GenericResourceApiServicedataServicedataVnfsVnf> vnfsList) {
-               
-               GenericResourceApiVnftopologyVnfTopology vnfTopology = new GenericResourceApiVnftopologyVnfTopology();
-               LOGGER.info(String.valueOf(vnfsList));
-               vnfTopology.setOnapModelInformation(vnfsList.get(0).getVnfData().getVnfInformation().getOnapModelInformation());
+
+    public void setVnfsData(List<GenericResourceApiServicedataServicedataVnfsVnf> vnfsList) {
+
+        final GenericResourceApiVnftopologyVnfTopology vnfTopology = new GenericResourceApiVnftopologyVnfTopology();
+        LOGGER.info(String.valueOf(vnfsList));
+        final String vnfId = vnfsList.get(0).getVnfId();
+        vnfTopology.setOnapModelInformation(vnfsList.get(0).getVnfData().getVnfInformation().getOnapModelInformation());
         vnfTopology.setAicClli(String.valueOf(vnfsList.get(0).getVnfData().getVnfRequestInput().getAicClli()));
         vnfTopology.setAicCloudRegion(String.valueOf(vnfsList.get(0).getVnfData().getVnfRequestInput().getAicCloudRegion()));
         vnfTopology.setCloudOwner(String.valueOf(vnfsList.get(0).getVnfData().getVnfRequestInput().getCloudOwner()));
@@ -643,7 +653,24 @@ public class ServiceOperationsCacheServiceProviderimpl extends AbstractCacheServ
         vnfTopology.setVnfTopologyIdentifierStructure(vnfsList.get(0).getVnfData().getVnfTopology().getVnfTopologyIdentifierStructure());
         vnfTopology.setVnfParametersData(vnfsList.get(0).getVnfData().getVnfTopology().getVnfParametersData());
         vnfTopology.setSdncGeneratedCloudResources(vnfsList.get(0).getVnfData().getVnfTopology().getSdncGeneratedCloudResources());
-               
+
+        final GenericResourceApiVnfTopology genericResourceApiVnfTopology = new GenericResourceApiVnfTopology();
         genericResourceApiVnfTopology.setVnfTopology(vnfTopology);
-       }
+
+        final Cache cache = getCache(Constants.SERVICE_TOPOLOGY_OPERATION_CACHE);
+        cache.put(vnfId, genericResourceApiVnfTopology);
+    }
+
+    @Override
+    public Optional<GenericResourceApiVnfTopology> getGenericResourceApiVnfTopology(final String vnfId) {
+        LOGGER.info("getting GenericResourceApiVnfTopology from cache using key: {}", vnfId);
+        final Cache cache = getCache(Constants.SERVICE_TOPOLOGY_OPERATION_CACHE);
+        final GenericResourceApiVnfTopology value =
+                cache.get(vnfId, GenericResourceApiVnfTopology.class);
+        if (value != null) {
+            return Optional.of(value);
+        }
+        LOGGER.error("Unable to find GenericResourceApiVnfTopology ...");
+        return Optional.empty();
+    }
 }
\ No newline at end of file
diff --git a/plans/so/macroflow/cloud_owner_sql/cloud_owner.sql b/plans/so/macroflow/cloud_owner_sql/cloud_owner.sql
deleted file mode 100644 (file)
index e514799..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Use catalogdb; 
-insert into cloud_sites(ID, REGION_ID, IDENTITY_SERVICE_ID, CLOUD_VERSION, CLLI, ORCHESTRATOR) values("EtsiCloudRegion", "EtsiCloudRegion", "DEFAULT_KEYSTONE", "2.5", "clli2", "multicloud");
\ No newline at end of file
diff --git a/plans/so/macroflow/config/distribution-test-zip/macro_zipped_sdc_csar.tar.gz b/plans/so/macroflow/config/distribution-test-zip/macro_zipped_sdc_csar.tar.gz
new file mode 100755 (executable)
index 0000000..f826c2e
Binary files /dev/null and b/plans/so/macroflow/config/distribution-test-zip/macro_zipped_sdc_csar.tar.gz differ
diff --git a/plans/so/macroflow/config/env b/plans/so/macroflow/config/env
new file mode 100644 (file)
index 0000000..f5453e9
--- /dev/null
@@ -0,0 +1,7 @@
+NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001
+DOCKER_ENVIRONMENT=remote
+TAG=1.8.0-STAGING-latest
+TIME_OUT_DEFAULT_VALUE_SEC=1200
+PROJECT_NAME=macroflowintegrationtesting
+DEFAULT_NETWORK_NAME=macroflowintegrationtesting_default
+MARIADB_VERSION=10.5.8
diff --git a/plans/so/macroflow/config/mariadb_engine_7.10.0.sql b/plans/so/macroflow/config/mariadb_engine_7.10.0.sql
new file mode 100644 (file)
index 0000000..b806210
--- /dev/null
@@ -0,0 +1,1361 @@
+--
+-- Copyright Â© 2012 - 2018 camunda services GmbH and various authors (info@camunda.com)
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+USE `camundabpmn`;
+
+
+create table ACT_GE_PROPERTY (
+    NAME_ varchar(64),
+    VALUE_ varchar(300),
+    REV_ integer,
+    primary key (NAME_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+insert into ACT_GE_PROPERTY
+values ('schema.version', 'fox', 1);
+
+insert into ACT_GE_PROPERTY
+values ('schema.history', 'create(fox)', 1);
+
+insert into ACT_GE_PROPERTY
+values ('next.dbid', '1', 1);
+
+insert into ACT_GE_PROPERTY
+values ('deployment.lock', '0', 1);
+
+insert into ACT_GE_PROPERTY
+values ('history.cleanup.job.lock', '0', 1);
+
+insert into ACT_GE_PROPERTY
+values ('startup.lock', '0', 1);
+
+insert into ACT_GE_PROPERTY
+values ('telemetry.lock', '0', 1);
+
+insert into ACT_GE_PROPERTY
+values ('installationId.lock', '0', 1);
+
+create table ACT_GE_BYTEARRAY (
+    ID_ varchar(64),
+    REV_ integer,
+    NAME_ varchar(255),
+    DEPLOYMENT_ID_ varchar(64),
+    BYTES_ LONGBLOB,
+    GENERATED_ TINYINT,
+    TENANT_ID_ varchar(64),
+    TYPE_ integer,
+    CREATE_TIME_ datetime(3),
+    ROOT_PROC_INST_ID_ varchar(64),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_GE_SCHEMA_LOG (
+    ID_ varchar(64),
+    TIMESTAMP_ datetime(3),
+    VERSION_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+insert into ACT_GE_SCHEMA_LOG
+values ('0', CURRENT_TIMESTAMP, '7.14.0');
+
+create table ACT_RE_DEPLOYMENT (
+    ID_ varchar(64),
+    NAME_ varchar(255),
+    DEPLOY_TIME_ datetime(3),
+    SOURCE_ varchar(255),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EXECUTION (
+    ID_ varchar(64),
+    REV_ integer,
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    BUSINESS_KEY_ varchar(255),
+    PARENT_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SUPER_EXEC_ varchar(64),
+    SUPER_CASE_EXEC_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    ACT_INST_ID_ varchar(64),
+    IS_ACTIVE_ TINYINT,
+    IS_CONCURRENT_ TINYINT,
+    IS_SCOPE_ TINYINT,
+    IS_EVENT_SCOPE_ TINYINT,
+    SUSPENSION_STATE_ integer,
+    CACHED_ENT_STATE_ integer,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ datetime(3) NULL,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROCESS_DEF_ID_ varchar(64),
+    PROCESS_DEF_KEY_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    FAILED_ACT_ID_ varchar(255),
+    DUEDATE_ datetime(3) NULL,
+    REPEAT_ varchar(255),
+    REPEAT_OFFSET_ bigint DEFAULT 0,
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    DEPLOYMENT_ID_ varchar(64),
+    SUSPENSION_STATE_ integer NOT NULL DEFAULT 1,
+    JOB_DEF_ID_ varchar(64),
+    PRIORITY_ bigint NOT NULL DEFAULT 0,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    CREATE_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_JOBDEF (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    ACT_ID_ varchar(255),
+    JOB_TYPE_ varchar(255) NOT NULL,
+    JOB_CONFIGURATION_ varchar(255),
+    SUSPENSION_STATE_ integer,
+    JOB_PRIORITY_ bigint,
+    TENANT_ID_ varchar(64),
+    DEPLOYMENT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RE_PROCDEF (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) not null,
+    VERSION_ integer not null,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    HAS_START_FORM_KEY_ TINYINT,
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(64),
+    VERSION_TAG_ varchar(64),
+    HISTORY_TTL_ integer,
+    STARTABLE_ boolean NOT NULL default TRUE,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_TASK (
+    ID_ varchar(64),
+    REV_ integer,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    TASK_DEF_KEY_ varchar(255),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    DELEGATION_ varchar(64),
+    PRIORITY_ integer,
+    CREATE_TIME_ datetime(3),
+    DUE_DATE_ datetime(3),
+    FOLLOW_UP_DATE_ datetime(3),
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_VARIABLE (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(255) not null,
+    NAME_ varchar(255) not null,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    BATCH_ID_ varchar(64),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(10000),
+    TEXT2_ varchar(4000),
+    VAR_SCOPE_ varchar(64) not null,
+    SEQUENCE_COUNTER_ bigint,
+    IS_CONCURRENT_LOCAL_ TINYINT,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    EVENT_TYPE_ varchar(255) not null,
+    EVENT_NAME_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(255),
+    CONFIGURATION_ varchar(255),
+    CREATED_ datetime(3) not null,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_INCIDENT (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  INCIDENT_TIMESTAMP_ datetime(3) not null,
+  INCIDENT_MSG_ varchar(4000),
+  INCIDENT_TYPE_ varchar(255) not null,
+  EXECUTION_ID_ varchar(64),
+  ACTIVITY_ID_ varchar(255),
+  FAILED_ACTIVITY_ID_ varchar(255),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  CAUSE_INCIDENT_ID_ varchar(64),
+  ROOT_CAUSE_INCIDENT_ID_ varchar(64),
+  CONFIGURATION_ varchar(255),
+  TENANT_ID_ varchar(64),
+  JOB_DEF_ID_ varchar(64),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_AUTHORIZATION (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  TYPE_ integer not null,
+  GROUP_ID_ varchar(255),
+  USER_ID_ varchar(255),
+  RESOURCE_TYPE_ integer not null,
+  RESOURCE_ID_ varchar(255),
+  PERMS_ integer,
+  REMOVAL_TIME_ datetime(3),
+  ROOT_PROC_INST_ID_ varchar(64),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_FILTER (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  RESOURCE_TYPE_ varchar(255) not null,
+  NAME_ varchar(255) not null,
+  OWNER_ varchar(255),
+  QUERY_ LONGTEXT not null,
+  PROPERTIES_ LONGTEXT,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_METER_LOG (
+  ID_ varchar(64) not null,
+  NAME_ varchar(64) not null,
+  REPORTER_ varchar(255),
+  VALUE_ bigint,
+  TIMESTAMP_ datetime(3),
+  MILLISECONDS_ bigint DEFAULT 0,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EXT_TASK (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  WORKER_ID_ varchar(255),
+  TOPIC_NAME_ varchar(255),
+  RETRIES_ integer,
+  ERROR_MSG_ varchar(4000),
+  ERROR_DETAILS_ID_ varchar(64),
+  LOCK_EXP_TIME_ datetime(3) NULL,
+  SUSPENSION_STATE_ integer,
+  EXECUTION_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  PROC_DEF_KEY_ varchar(255),
+  ACT_ID_ varchar(255),
+  ACT_INST_ID_ varchar(64),
+  TENANT_ID_ varchar(64),
+  PRIORITY_ bigint NOT NULL DEFAULT 0,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_BATCH (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  TYPE_ varchar(255),
+  TOTAL_JOBS_ integer,
+  JOBS_CREATED_ integer,
+  JOBS_PER_SEED_ integer,
+  INVOCATIONS_PER_JOB_ integer,
+  SEED_JOB_DEF_ID_ varchar(64),
+  BATCH_JOB_DEF_ID_ varchar(64),
+  MONITOR_JOB_DEF_ID_ varchar(64),
+  SUSPENSION_STATE_ integer,
+  CONFIGURATION_ varchar(255),
+  TENANT_ID_ varchar(64),
+  CREATE_USER_ID_ varchar(255),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_EXEC_ROOT_PI on ACT_RU_EXECUTION(ROOT_PROC_INST_ID_);
+create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_);
+create index ACT_IDX_EXEC_TENANT_ID on ACT_RU_EXECUTION(TENANT_ID_);
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_ASSIGNEE on ACT_RU_TASK(ASSIGNEE_);
+create index ACT_IDX_TASK_OWNER on ACT_RU_TASK(OWNER_);
+create index ACT_IDX_TASK_TENANT_ID on ACT_RU_TASK(TENANT_ID_);
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR_TENANT_ID on ACT_RU_EVENT_SUBSCR(TENANT_ID_);
+
+create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_);
+create index ACT_IDX_VARIABLE_TENANT_ID on ACT_RU_VARIABLE(TENANT_ID_);
+create index ACT_IDX_VARIABLE_TASK_NAME_TYPE on ACT_RU_VARIABLE(TASK_ID_, NAME_, TYPE_);
+
+create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_);
+create index ACT_IDX_INC_CONFIGURATION on ACT_RU_INCIDENT(CONFIGURATION_);
+create index ACT_IDX_INC_TENANT_ID on ACT_RU_INCIDENT(TENANT_ID_);
+-- CAM-5914
+create index ACT_IDX_JOB_EXECUTION_ID on ACT_RU_JOB(EXECUTION_ID_);
+-- this index needs to be limited in mariadb see CAM-6938
+create index ACT_IDX_JOB_HANDLER on ACT_RU_JOB(HANDLER_TYPE_(100),HANDLER_CFG_(155));
+create index ACT_IDX_JOB_PROCINST on ACT_RU_JOB(PROCESS_INSTANCE_ID_);
+create index ACT_IDX_JOB_TENANT_ID on ACT_RU_JOB(TENANT_ID_);
+create index ACT_IDX_JOBDEF_TENANT_ID on ACT_RU_JOBDEF(TENANT_ID_);
+
+-- new metric milliseconds column
+CREATE INDEX ACT_IDX_METER_LOG_MS ON ACT_RU_METER_LOG(MILLISECONDS_);
+CREATE INDEX ACT_IDX_METER_LOG_NAME_MS ON ACT_RU_METER_LOG(NAME_, MILLISECONDS_);
+CREATE INDEX ACT_IDX_METER_LOG_REPORT ON ACT_RU_METER_LOG(NAME_, REPORTER_, MILLISECONDS_);
+
+-- old metric timestamp column
+CREATE INDEX ACT_IDX_METER_LOG_TIME ON ACT_RU_METER_LOG(TIMESTAMP_);
+CREATE INDEX ACT_IDX_METER_LOG ON ACT_RU_METER_LOG(NAME_, TIMESTAMP_);
+
+create index ACT_IDX_EXT_TASK_TOPIC on ACT_RU_EXT_TASK(TOPIC_NAME_);
+create index ACT_IDX_EXT_TASK_TENANT_ID on ACT_RU_EXT_TASK(TENANT_ID_);
+create index ACT_IDX_EXT_TASK_PRIORITY ON ACT_RU_EXT_TASK(PRIORITY_);
+create index ACT_IDX_EXT_TASK_ERR_DETAILS ON ACT_RU_EXT_TASK(ERROR_DETAILS_ID_);
+create index ACT_IDX_AUTH_GROUP_ID ON ACT_RU_AUTHORIZATION(GROUP_ID_);
+create index ACT_IDX_JOB_JOB_DEF_ID on ACT_RU_JOB(JOB_DEF_ID_);
+
+alter table ACT_GE_BYTEARRAY
+    add constraint ACT_FK_BYTEARR_DEPL
+    foreign key (DEPLOYMENT_ID_)
+    references ACT_RE_DEPLOYMENT (ID_);
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_PARENT
+    foreign key (PARENT_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_SUPER
+    foreign key (SUPER_EXEC_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_PROCDEF
+    foreign key (PROC_DEF_ID_)
+    references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_IDENTITYLINK
+    add constraint ACT_FK_TSKASS_TASK
+    foreign key (TASK_ID_)
+    references ACT_RU_TASK (ID_);
+
+alter table ACT_RU_IDENTITYLINK
+    add constraint ACT_FK_ATHRZ_PROCEDEF
+    foreign key (PROC_DEF_ID_)
+    references ACT_RE_PROCDEF(ID_);
+
+alter table ACT_RU_TASK
+    add constraint ACT_FK_TASK_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_TASK
+    add constraint ACT_FK_TASK_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_TASK
+  add constraint ACT_FK_TASK_PROCDEF
+  foreign key (PROC_DEF_ID_)
+  references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION(ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_BYTEARRAY
+    foreign key (BYTEARRAY_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EVENT_SUBSCR
+    add constraint ACT_FK_EVENT_EXEC
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION(ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_PROCDEF
+    foreign key (PROC_DEF_ID_)
+    references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_CAUSE
+    foreign key (CAUSE_INCIDENT_ID_)
+    references ACT_RU_INCIDENT (ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_RCAUSE
+    foreign key (ROOT_CAUSE_INCIDENT_ID_)
+    references ACT_RU_INCIDENT (ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_EXT_TASK
+    add constraint ACT_FK_EXT_TASK_ERROR_DETAILS
+    foreign key (ERROR_DETAILS_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_INC_JOB_DEF on ACT_RU_INCIDENT(JOB_DEF_ID_);
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_JOB_DEF
+    foreign key (JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+alter table ACT_RU_AUTHORIZATION
+    add constraint ACT_UNIQ_AUTH_USER
+    unique (USER_ID_,TYPE_,RESOURCE_TYPE_,RESOURCE_ID_);
+
+alter table ACT_RU_AUTHORIZATION
+    add constraint ACT_UNIQ_AUTH_GROUP
+    unique (GROUP_ID_,TYPE_,RESOURCE_TYPE_,RESOURCE_ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_UNIQ_VARIABLE
+    unique (VAR_SCOPE_, NAME_);
+
+alter table ACT_RU_EXT_TASK
+    add constraint ACT_FK_EXT_TASK_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+create index ACT_IDX_BATCH_SEED_JOB_DEF ON ACT_RU_BATCH(SEED_JOB_DEF_ID_);
+alter table ACT_RU_BATCH
+    add constraint ACT_FK_BATCH_SEED_JOB_DEF
+    foreign key (SEED_JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+create index ACT_IDX_BATCH_MONITOR_JOB_DEF ON ACT_RU_BATCH(MONITOR_JOB_DEF_ID_);
+alter table ACT_RU_BATCH
+    add constraint ACT_FK_BATCH_MONITOR_JOB_DEF
+    foreign key (MONITOR_JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+create index ACT_IDX_BATCH_JOB_DEF ON ACT_RU_BATCH(BATCH_JOB_DEF_ID_);
+alter table ACT_RU_BATCH
+    add constraint ACT_FK_BATCH_JOB_DEF
+    foreign key (BATCH_JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+create index ACT_IDX_BATCH_ID ON ACT_RU_VARIABLE(BATCH_ID_);
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_BATCH
+    foreign key (BATCH_ID_)
+    references ACT_RU_BATCH (ID_);
+
+-- indexes for deadlock problems - https://app.camunda.com/jira/browse/CAM-2567 --
+create index ACT_IDX_INC_CAUSEINCID on ACT_RU_INCIDENT(CAUSE_INCIDENT_ID_);
+create index ACT_IDX_INC_EXID on ACT_RU_INCIDENT(EXECUTION_ID_);
+create index ACT_IDX_INC_PROCDEFID on ACT_RU_INCIDENT(PROC_DEF_ID_);
+create index ACT_IDX_INC_PROCINSTID on ACT_RU_INCIDENT(PROC_INST_ID_);
+create index ACT_IDX_INC_ROOTCAUSEINCID on ACT_RU_INCIDENT(ROOT_CAUSE_INCIDENT_ID_);
+-- index for deadlock problem - https://app.camunda.com/jira/browse/CAM-4440 --
+create index ACT_IDX_AUTH_RESOURCE_ID on ACT_RU_AUTHORIZATION(RESOURCE_ID_);
+-- index to prevent deadlock on fk constraint - https://app.camunda.com/jira/browse/CAM-5440 --
+create index ACT_IDX_EXT_TASK_EXEC on ACT_RU_EXT_TASK(EXECUTION_ID_);
+
+-- indexes to improve deployment
+create index ACT_IDX_BYTEARRAY_ROOT_PI on ACT_GE_BYTEARRAY(ROOT_PROC_INST_ID_);
+create index ACT_IDX_BYTEARRAY_RM_TIME on ACT_GE_BYTEARRAY(REMOVAL_TIME_);
+create index ACT_IDX_BYTEARRAY_NAME on ACT_GE_BYTEARRAY(NAME_);
+create index ACT_IDX_DEPLOYMENT_NAME on ACT_RE_DEPLOYMENT(NAME_);
+create index ACT_IDX_DEPLOYMENT_TENANT_ID on ACT_RE_DEPLOYMENT(TENANT_ID_);
+create index ACT_IDX_JOBDEF_PROC_DEF_ID ON ACT_RU_JOBDEF(PROC_DEF_ID_);
+create index ACT_IDX_JOB_HANDLER_TYPE ON ACT_RU_JOB(HANDLER_TYPE_);
+create index ACT_IDX_EVENT_SUBSCR_EVT_NAME ON ACT_RU_EVENT_SUBSCR(EVENT_NAME_);
+create index ACT_IDX_PROCDEF_DEPLOYMENT_ID ON ACT_RE_PROCDEF(DEPLOYMENT_ID_);
+create index ACT_IDX_PROCDEF_TENANT_ID ON ACT_RE_PROCDEF(TENANT_ID_);
+create index ACT_IDX_PROCDEF_VER_TAG ON ACT_RE_PROCDEF(VERSION_TAG_);
+
+-- indices for history cleanup: https://jira.camunda.com/browse/CAM-11616
+create index ACT_IDX_AUTH_ROOT_PI on ACT_RU_AUTHORIZATION(ROOT_PROC_INST_ID_);
+create index ACT_IDX_AUTH_RM_TIME on ACT_RU_AUTHORIZATION(REMOVAL_TIME_);
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+-- create case definition table --
+create table ACT_RE_CASE_DEF (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) not null,
+    VERSION_ integer not null,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    HISTORY_TTL_ integer,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create case execution table --
+create table ACT_RU_CASE_EXECUTION (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CASE_INST_ID_ varchar(64),
+    SUPER_CASE_EXEC_ varchar(64),
+    SUPER_EXEC_ varchar(64),
+    BUSINESS_KEY_ varchar(255),
+    PARENT_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    PREV_STATE_ integer,
+    CURRENT_STATE_ integer,
+    REQUIRED_ boolean,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create case sentry part table --
+
+create table ACT_RU_CASE_SENTRY_PART (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CASE_INST_ID_ varchar(64),
+    CASE_EXEC_ID_ varchar(64),
+    SENTRY_ID_ varchar(255),
+    TYPE_ varchar(255),
+    SOURCE_CASE_EXEC_ID_ varchar(64),
+    STANDARD_EVENT_ varchar(255),
+    SOURCE_ varchar(255),
+    VARIABLE_EVENT_ varchar(255),
+    VARIABLE_NAME_ varchar(255),
+    SATISFIED_ boolean,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create index on business key --
+create index ACT_IDX_CASE_EXEC_BUSKEY on ACT_RU_CASE_EXECUTION(BUSINESS_KEY_);
+
+-- https://app.camunda.com/jira/browse/CAM-9165
+create index ACT_IDX_CASE_EXE_CASE_INST on ACT_RU_CASE_EXECUTION(CASE_INST_ID_);
+
+-- create foreign key constraints on ACT_RU_CASE_EXECUTION --
+alter table ACT_RU_CASE_EXECUTION
+    add constraint ACT_FK_CASE_EXE_CASE_INST
+    foreign key (CASE_INST_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_CASE_EXECUTION
+    add constraint ACT_FK_CASE_EXE_PARENT
+    foreign key (PARENT_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_CASE_EXECUTION
+    add constraint ACT_FK_CASE_EXE_CASE_DEF
+    foreign key (CASE_DEF_ID_)
+    references ACT_RE_CASE_DEF(ID_);
+
+-- create foreign key constraints on ACT_RU_VARIABLE --
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_CASE_EXE
+    foreign key (CASE_EXECUTION_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_CASE_INST
+    foreign key (CASE_INST_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+-- create foreign key constraints on ACT_RU_TASK --
+alter table ACT_RU_TASK
+    add constraint ACT_FK_TASK_CASE_EXE
+    foreign key (CASE_EXECUTION_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_TASK
+  add constraint ACT_FK_TASK_CASE_DEF
+  foreign key (CASE_DEF_ID_)
+  references ACT_RE_CASE_DEF(ID_);
+
+-- create foreign key constraints on ACT_RU_CASE_SENTRY_PART --
+alter table ACT_RU_CASE_SENTRY_PART
+    add constraint ACT_FK_CASE_SENTRY_CASE_INST
+    foreign key (CASE_INST_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_CASE_SENTRY_PART
+    add constraint ACT_FK_CASE_SENTRY_CASE_EXEC
+    foreign key (CASE_EXEC_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+create index ACT_IDX_CASE_DEF_TENANT_ID on ACT_RE_CASE_DEF(TENANT_ID_);
+create index ACT_IDX_CASE_EXEC_TENANT_ID on ACT_RU_CASE_EXECUTION(TENANT_ID_);
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+-- create decision definition table --
+create table ACT_RE_DECISION_DEF (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) not null,
+    VERSION_ integer not null,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    DEC_REQ_ID_ varchar(64),
+    DEC_REQ_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    HISTORY_TTL_ integer,
+    VERSION_TAG_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create decision requirements definition table --
+create table ACT_RE_DECISION_REQ_DEF (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) NOT NULL,
+    VERSION_ integer NOT NULL,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+alter table ACT_RE_DECISION_DEF
+    add constraint ACT_FK_DEC_REQ
+    foreign key (DEC_REQ_ID_)
+    references ACT_RE_DECISION_REQ_DEF(ID_);
+
+create index ACT_IDX_DEC_DEF_TENANT_ID on ACT_RE_DECISION_DEF(TENANT_ID_);
+create index ACT_IDX_DEC_DEF_REQ_ID on ACT_RE_DECISION_DEF(DEC_REQ_ID_);
+create index ACT_IDX_DEC_REQ_DEF_TENANT_ID on ACT_RE_DECISION_REQ_DEF(TENANT_ID_);
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+create table ACT_HI_PROCINST (
+    ID_ varchar(64) not null,
+    PROC_INST_ID_ varchar(64) not null,
+    BUSINESS_KEY_ varchar(255),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64) not null,
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    REMOVAL_TIME_ datetime(3),
+    DURATION_ bigint,
+    START_USER_ID_ varchar(255),
+    START_ACT_ID_ varchar(255),
+    END_ACT_ID_ varchar(255),
+    SUPER_PROCESS_INSTANCE_ID_ varchar(64),
+    ROOT_PROC_INST_ID_ varchar(64),
+    SUPER_CASE_INSTANCE_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    DELETE_REASON_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    STATE_ varchar(255),
+    primary key (ID_),
+    unique (PROC_INST_ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_ACTINST (
+    ID_ varchar(64) not null,
+    PARENT_ACT_INST_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64) not null,
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64) not null,
+    EXECUTION_ID_ varchar(64) not null,
+    ACT_ID_ varchar(255) not null,
+    TASK_ID_ varchar(64),
+    CALL_PROC_INST_ID_ varchar(64),
+    CALL_CASE_INST_ID_ varchar(64),
+    ACT_NAME_ varchar(255),
+    ACT_TYPE_ varchar(255) not null,
+    ASSIGNEE_ varchar(255),
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    ACT_INST_STATE_ integer,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_TASKINST (
+    ID_ varchar(64) not null,
+    TASK_DEF_KEY_ varchar(255),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    DELETE_REASON_ varchar(4000),
+    PRIORITY_ integer,
+    DUE_DATE_ datetime(3),
+    FOLLOW_UP_DATE_ datetime(3),
+    TENANT_ID_ varchar(64),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_VARINST (
+    ID_ varchar(64) not null,
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(100),
+    CREATE_TIME_ datetime(3),
+    REV_ integer,
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(10000),
+    TEXT2_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    STATE_ varchar(20),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_DETAIL (
+    ID_ varchar(64) not null,
+    TYPE_ varchar(255) not null,
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    VAR_INST_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(255),
+    REV_ integer,
+    TIME_ datetime(3) not null,
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(10000),
+    TEXT2_ varchar(4000),
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    OPERATION_ID_ varchar(64),
+    REMOVAL_TIME_ datetime(3),
+    INITIAL_ boolean,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ timestamp(3) not null,
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    GROUP_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    OPERATION_TYPE_ varchar(64),
+    ASSIGNER_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_COMMENT (
+    ID_ varchar(64) not null,
+    TYPE_ varchar(255),
+    TIME_ datetime(3) not null,
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTION_ varchar(255),
+    MESSAGE_ varchar(4000),
+    FULL_MSG_ LONGBLOB,
+    TENANT_ID_ varchar(64),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_ATTACHMENT (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    USER_ID_ varchar(255),
+    NAME_ varchar(255),
+    DESCRIPTION_ varchar(4000),
+    TYPE_ varchar(255),
+    TASK_ID_ varchar(64),
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    URL_ varchar(4000),
+    CONTENT_ID_ varchar(64),
+    TENANT_ID_ varchar(64),
+    CREATE_TIME_ datetime(3),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_OP_LOG (
+    ID_ varchar(64) not null,
+    DEPLOYMENT_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    JOB_ID_ varchar(64),
+    JOB_DEF_ID_ varchar(64),
+    BATCH_ID_ varchar(64),
+    USER_ID_ varchar(255),
+    TIMESTAMP_ timestamp(3) not null,
+    OPERATION_TYPE_ varchar(64),
+    OPERATION_ID_ varchar(64),
+    ENTITY_TYPE_ varchar(30),
+    PROPERTY_ varchar(64),
+    ORG_VALUE_ varchar(4000),
+    NEW_VALUE_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    REMOVAL_TIME_ datetime(3),
+       CATEGORY_ varchar(64),
+       EXTERNAL_TASK_ID_ varchar(64),
+       ANNOTATION_ varchar(4000),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_INCIDENT (
+  ID_ varchar(64) not null,
+  PROC_DEF_KEY_ varchar(255),
+  PROC_DEF_ID_ varchar(64),
+  ROOT_PROC_INST_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  EXECUTION_ID_ varchar(64),
+  CREATE_TIME_ timestamp(3) not null,
+  END_TIME_ timestamp(3) null,
+  INCIDENT_MSG_ varchar(4000),
+  INCIDENT_TYPE_ varchar(255) not null,
+  ACTIVITY_ID_ varchar(255),
+  FAILED_ACTIVITY_ID_ varchar(255),
+  CAUSE_INCIDENT_ID_ varchar(64),
+  ROOT_CAUSE_INCIDENT_ID_ varchar(64),
+  CONFIGURATION_ varchar(255),
+  HISTORY_CONFIGURATION_ varchar(255),
+  INCIDENT_STATE_ integer,
+  TENANT_ID_ varchar(64),
+  JOB_DEF_ID_ varchar(64),
+  REMOVAL_TIME_ datetime(3),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_JOB_LOG (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ datetime(3) not null,
+    JOB_ID_ varchar(64) not null,
+    JOB_DUEDATE_ datetime(3) NULL,
+    JOB_RETRIES_ integer,
+    JOB_PRIORITY_ bigint NOT NULL DEFAULT 0,
+    JOB_EXCEPTION_MSG_ varchar(4000),
+    JOB_EXCEPTION_STACK_ID_ varchar(64),
+    JOB_STATE_ integer,
+    JOB_DEF_ID_ varchar(64),
+    JOB_DEF_TYPE_ varchar(255),
+    JOB_DEF_CONFIGURATION_ varchar(255),
+    ACT_ID_ varchar(255),
+    FAILED_ACT_ID_ varchar(255),
+    ROOT_PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROCESS_DEF_ID_ varchar(64),
+    PROCESS_DEF_KEY_ varchar(255),
+    DEPLOYMENT_ID_ varchar(64),
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    HOSTNAME_ varchar(255),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_BATCH (
+    ID_ varchar(64) not null,
+    TYPE_ varchar(255),
+    TOTAL_JOBS_ integer,
+    JOBS_PER_SEED_ integer,
+    INVOCATIONS_PER_JOB_ integer,
+    SEED_JOB_DEF_ID_ varchar(64),
+    MONITOR_JOB_DEF_ID_ varchar(64),
+    BATCH_JOB_DEF_ID_ varchar(64),
+    TENANT_ID_  varchar(64),
+    CREATE_USER_ID_ varchar(255),
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_EXT_TASK_LOG (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ timestamp(3) not null,
+    EXT_TASK_ID_ varchar(64) not null,
+    RETRIES_ integer,
+    TOPIC_NAME_ varchar(255),
+    WORKER_ID_ varchar(255),
+    PRIORITY_ bigint NOT NULL DEFAULT 0,
+    ERROR_MSG_ varchar(4000),
+    ERROR_DETAILS_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    ACT_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    ROOT_PROC_INST_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    STATE_ integer,
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_);
+create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_);
+create index ACT_IDX_HI_PRO_INST_TENANT_ID on ACT_HI_PROCINST(TENANT_ID_);
+create index ACT_IDX_HI_PRO_INST_PROC_DEF_KEY on ACT_HI_PROCINST(PROC_DEF_KEY_);
+create index ACT_IDX_HI_PRO_INST_PROC_TIME on ACT_HI_PROCINST(START_TIME_, END_TIME_);
+create index ACT_IDX_HI_PI_PDEFID_END_TIME on ACT_HI_PROCINST(PROC_DEF_ID_, END_TIME_);
+create index ACT_IDX_HI_PRO_INST_ROOT_PI on ACT_HI_PROCINST(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_PRO_INST_RM_TIME on ACT_HI_PROCINST(REMOVAL_TIME_);
+
+create index ACT_IDX_HI_ACTINST_ROOT_PI on ACT_HI_ACTINST(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_ACT_INST_START_END on ACT_HI_ACTINST(START_TIME_, END_TIME_);
+create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_);
+create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_);
+create index ACT_IDX_HI_ACT_INST_COMP on ACT_HI_ACTINST(EXECUTION_ID_, ACT_ID_, END_TIME_, ID_);
+create index ACT_IDX_HI_ACT_INST_STATS on ACT_HI_ACTINST(PROC_DEF_ID_, PROC_INST_ID_, ACT_ID_, END_TIME_, ACT_INST_STATE_);
+create index ACT_IDX_HI_ACT_INST_TENANT_ID on ACT_HI_ACTINST(TENANT_ID_);
+create index ACT_IDX_HI_ACT_INST_PROC_DEF_KEY on ACT_HI_ACTINST(PROC_DEF_KEY_);
+create index ACT_IDX_HI_AI_PDEFID_END_TIME on ACT_HI_ACTINST(PROC_DEF_ID_, END_TIME_);
+create index ACT_IDX_HI_ACT_INST_RM_TIME on ACT_HI_ACTINST(REMOVAL_TIME_);
+
+create index ACT_IDX_HI_TASKINST_ROOT_PI on ACT_HI_TASKINST(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_TASK_INST_TENANT_ID on ACT_HI_TASKINST(TENANT_ID_);
+create index ACT_IDX_HI_TASK_INST_PROC_DEF_KEY on ACT_HI_TASKINST(PROC_DEF_KEY_);
+create index ACT_IDX_HI_TASKINST_PROCINST on ACT_HI_TASKINST(PROC_INST_ID_);
+create index ACT_IDX_HI_TASKINSTID_PROCINST on ACT_HI_TASKINST(ID_,PROC_INST_ID_);
+create index ACT_IDX_HI_TASK_INST_RM_TIME on ACT_HI_TASKINST(REMOVAL_TIME_);
+create index ACT_IDX_HI_TASK_INST_START on ACT_HI_TASKINST(START_TIME_);
+create index ACT_IDX_HI_TASK_INST_END on ACT_HI_TASKINST(END_TIME_);
+
+create index ACT_IDX_HI_DETAIL_ROOT_PI on ACT_HI_DETAIL(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_);
+create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_);
+create index ACT_IDX_HI_DETAIL_CASE_INST on ACT_HI_DETAIL(CASE_INST_ID_);
+create index ACT_IDX_HI_DETAIL_CASE_EXEC on ACT_HI_DETAIL(CASE_EXECUTION_ID_);
+create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_);
+create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_);
+create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_);
+create index ACT_IDX_HI_DETAIL_TENANT_ID on ACT_HI_DETAIL(TENANT_ID_);
+create index ACT_IDX_HI_DETAIL_PROC_DEF_KEY on ACT_HI_DETAIL(PROC_DEF_KEY_);
+create index ACT_IDX_HI_DETAIL_BYTEAR on ACT_HI_DETAIL(BYTEARRAY_ID_);
+create index ACT_IDX_HI_DETAIL_RM_TIME on ACT_HI_DETAIL(REMOVAL_TIME_);
+create index ACT_IDX_HI_DETAIL_TASK_BYTEAR on ACT_HI_DETAIL(BYTEARRAY_ID_, TASK_ID_);
+create index ACT_IDX_HI_DETAIL_VAR_INST_ID on ACT_HI_DETAIL(VAR_INST_ID_);
+
+create index ACT_IDX_HI_IDENT_LNK_ROOT_PI on ACT_HI_IDENTITYLINK(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_GROUP on ACT_HI_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_HI_IDENT_LNK_TENANT_ID on ACT_HI_IDENTITYLINK(TENANT_ID_);
+create index ACT_IDX_HI_IDENT_LNK_PROC_DEF_KEY on ACT_HI_IDENTITYLINK(PROC_DEF_KEY_);
+create index ACT_IDX_HI_IDENT_LINK_TASK on ACT_HI_IDENTITYLINK(TASK_ID_);
+create index ACT_IDX_HI_IDENT_LINK_RM_TIME on ACT_HI_IDENTITYLINK(REMOVAL_TIME_);
+create index ACT_IDX_HI_IDENT_LNK_TIMESTAMP on ACT_HI_IDENTITYLINK(TIMESTAMP_);
+
+create index ACT_IDX_HI_VARINST_ROOT_PI on ACT_HI_VARINST(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_);
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_CASEVAR_CASE_INST on ACT_HI_VARINST(CASE_INST_ID_);
+create index ACT_IDX_HI_VAR_INST_TENANT_ID on ACT_HI_VARINST(TENANT_ID_);
+create index ACT_IDX_HI_VAR_INST_PROC_DEF_KEY on ACT_HI_VARINST(PROC_DEF_KEY_);
+create index ACT_IDX_HI_VARINST_BYTEAR on ACT_HI_VARINST(BYTEARRAY_ID_);
+create index ACT_IDX_HI_VARINST_RM_TIME on ACT_HI_VARINST(REMOVAL_TIME_);
+create index ACT_IDX_HI_VAR_PI_NAME_TYPE on ACT_HI_VARINST(PROC_INST_ID_, NAME_, VAR_TYPE_);
+
+create index ACT_IDX_HI_INCIDENT_TENANT_ID on ACT_HI_INCIDENT(TENANT_ID_);
+create index ACT_IDX_HI_INCIDENT_PROC_DEF_KEY on ACT_HI_INCIDENT(PROC_DEF_KEY_);
+create index ACT_IDX_HI_INCIDENT_ROOT_PI on ACT_HI_INCIDENT(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_INCIDENT_PROCINST on ACT_HI_INCIDENT(PROC_INST_ID_);
+create index ACT_IDX_HI_INCIDENT_RM_TIME on ACT_HI_INCIDENT(REMOVAL_TIME_);
+create index ACT_IDX_HI_INCIDENT_CREATE_TIME on ACT_HI_INCIDENT(CREATE_TIME_);
+create index ACT_IDX_HI_INCIDENT_END_TIME on ACT_HI_INCIDENT(END_TIME_);
+
+create index ACT_IDX_HI_JOB_LOG_ROOT_PI on ACT_HI_JOB_LOG(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_JOB_LOG_PROCINST on ACT_HI_JOB_LOG(PROCESS_INSTANCE_ID_);
+create index ACT_IDX_HI_JOB_LOG_PROCDEF on ACT_HI_JOB_LOG(PROCESS_DEF_ID_);
+create index ACT_IDX_HI_JOB_LOG_TENANT_ID on ACT_HI_JOB_LOG(TENANT_ID_);
+create index ACT_IDX_HI_JOB_LOG_JOB_DEF_ID on ACT_HI_JOB_LOG(JOB_DEF_ID_);
+create index ACT_IDX_HI_JOB_LOG_PROC_DEF_KEY on ACT_HI_JOB_LOG(PROCESS_DEF_KEY_);
+create index ACT_IDX_HI_JOB_LOG_EX_STACK on ACT_HI_JOB_LOG(JOB_EXCEPTION_STACK_ID_);
+create index ACT_IDX_HI_JOB_LOG_RM_TIME on ACT_HI_JOB_LOG(REMOVAL_TIME_);
+create index ACT_IDX_HI_JOB_LOG_JOB_CONF on ACT_HI_JOB_LOG(JOB_DEF_CONFIGURATION_);
+
+create index ACT_HI_BAT_RM_TIME on ACT_HI_BATCH(REMOVAL_TIME_);
+
+create index ACT_HI_EXT_TASK_LOG_ROOT_PI on ACT_HI_EXT_TASK_LOG(ROOT_PROC_INST_ID_);
+create index ACT_HI_EXT_TASK_LOG_PROCINST on ACT_HI_EXT_TASK_LOG(PROC_INST_ID_);
+create index ACT_HI_EXT_TASK_LOG_PROCDEF on ACT_HI_EXT_TASK_LOG(PROC_DEF_ID_);
+create index ACT_HI_EXT_TASK_LOG_PROC_DEF_KEY on ACT_HI_EXT_TASK_LOG(PROC_DEF_KEY_);
+create index ACT_HI_EXT_TASK_LOG_TENANT_ID on ACT_HI_EXT_TASK_LOG(TENANT_ID_);
+create index ACT_IDX_HI_EXTTASKLOG_ERRORDET on ACT_HI_EXT_TASK_LOG(ERROR_DETAILS_ID_);
+create index ACT_HI_EXT_TASK_LOG_RM_TIME on ACT_HI_EXT_TASK_LOG(REMOVAL_TIME_);
+
+create index ACT_IDX_HI_OP_LOG_ROOT_PI on ACT_HI_OP_LOG(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_OP_LOG_PROCINST on ACT_HI_OP_LOG(PROC_INST_ID_);
+create index ACT_IDX_HI_OP_LOG_PROCDEF on ACT_HI_OP_LOG(PROC_DEF_ID_);
+create index ACT_IDX_HI_OP_LOG_TASK on ACT_HI_OP_LOG(TASK_ID_);
+create index ACT_IDX_HI_OP_LOG_RM_TIME on ACT_HI_OP_LOG(REMOVAL_TIME_);
+create index ACT_IDX_HI_OP_LOG_TIMESTAMP on ACT_HI_OP_LOG(TIMESTAMP_);
+create index ACT_IDX_HI_OP_LOG_USER_ID on ACT_HI_OP_LOG(USER_ID_);
+create index ACT_IDX_HI_OP_LOG_OP_TYPE on ACT_HI_OP_LOG(OPERATION_TYPE_);
+create index ACT_IDX_HI_OP_LOG_ENTITY_TYPE on ACT_HI_OP_LOG(ENTITY_TYPE_);
+
+create index ACT_IDX_HI_COMMENT_TASK on ACT_HI_COMMENT(TASK_ID_);
+create index ACT_IDX_HI_COMMENT_ROOT_PI on ACT_HI_COMMENT(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_COMMENT_PROCINST on ACT_HI_COMMENT(PROC_INST_ID_);
+create index ACT_IDX_HI_COMMENT_RM_TIME on ACT_HI_COMMENT(REMOVAL_TIME_);
+
+create index ACT_IDX_HI_ATTACHMENT_CONTENT on ACT_HI_ATTACHMENT(CONTENT_ID_);
+create index ACT_IDX_HI_ATTACHMENT_ROOT_PI on ACT_HI_ATTACHMENT(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_ATTACHMENT_PROCINST on ACT_HI_ATTACHMENT(PROC_INST_ID_);
+create index ACT_IDX_HI_ATTACHMENT_TASK on ACT_HI_ATTACHMENT(TASK_ID_);
+create index ACT_IDX_HI_ATTACHMENT_RM_TIME on ACT_HI_ATTACHMENT(REMOVAL_TIME_);
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+create table ACT_HI_CASEINST (
+    ID_ varchar(64) not null,
+    CASE_INST_ID_ varchar(64) not null,
+    BUSINESS_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64) not null,
+    CREATE_TIME_ datetime(3) not null,
+    CLOSE_TIME_ datetime(3),
+    DURATION_ bigint,
+    STATE_ integer,
+    CREATE_USER_ID_ varchar(255),
+    SUPER_CASE_INSTANCE_ID_ varchar(64),
+    SUPER_PROCESS_INSTANCE_ID_ varchar(64),
+    TENANT_ID_ varchar(64),
+    primary key (ID_),
+    unique (CASE_INST_ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_CASEACTINST (
+    ID_ varchar(64) not null,
+    PARENT_ACT_INST_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64) not null,
+    CASE_INST_ID_ varchar(64) not null,
+    CASE_ACT_ID_ varchar(255) not null,
+    TASK_ID_ varchar(64),
+    CALL_PROC_INST_ID_ varchar(64),
+    CALL_CASE_INST_ID_ varchar(64),
+    CASE_ACT_NAME_ varchar(255),
+    CASE_ACT_TYPE_ varchar(255),
+    CREATE_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    STATE_ integer,
+    REQUIRED_ boolean,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_CAS_I_CLOSE on ACT_HI_CASEINST(CLOSE_TIME_);
+create index ACT_IDX_HI_CAS_I_BUSKEY on ACT_HI_CASEINST(BUSINESS_KEY_);
+create index ACT_IDX_HI_CAS_I_TENANT_ID on ACT_HI_CASEINST(TENANT_ID_);
+create index ACT_IDX_HI_CAS_A_I_CREATE on ACT_HI_CASEACTINST(CREATE_TIME_);
+create index ACT_IDX_HI_CAS_A_I_END on ACT_HI_CASEACTINST(END_TIME_);
+create index ACT_IDX_HI_CAS_A_I_COMP on ACT_HI_CASEACTINST(CASE_ACT_ID_, END_TIME_, ID_);
+create index ACT_IDX_HI_CAS_A_I_CASEINST on ACT_HI_CASEACTINST(CASE_INST_ID_, CASE_ACT_ID_);
+create index ACT_IDX_HI_CAS_A_I_TENANT_ID on ACT_HI_CASEACTINST(TENANT_ID_);
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+-- create history decision instance table --
+create table ACT_HI_DECINST (
+    ID_ varchar(64) NOT NULL,
+    DEC_DEF_ID_ varchar(64) NOT NULL,
+    DEC_DEF_KEY_ varchar(255) NOT NULL,
+    DEC_DEF_NAME_ varchar(255),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    EVAL_TIME_ datetime(3) not null,
+    REMOVAL_TIME_ datetime(3),
+    COLLECT_VALUE_ double,
+    USER_ID_ varchar(255),
+    ROOT_DEC_INST_ID_ varchar(64),
+    ROOT_PROC_INST_ID_ varchar(64),
+    DEC_REQ_ID_ varchar(64),
+    DEC_REQ_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create history decision input table --
+create table ACT_HI_DEC_IN (
+    ID_ varchar(64) NOT NULL,
+    DEC_INST_ID_ varchar(64) NOT NULL,
+    CLAUSE_ID_ varchar(64),
+    CLAUSE_NAME_ varchar(255),
+    VAR_TYPE_ varchar(100),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(10000),
+    TEXT2_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    CREATE_TIME_ datetime(3),
+    ROOT_PROC_INST_ID_ varchar(64),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create history decision output table --
+create table ACT_HI_DEC_OUT (
+    ID_ varchar(64) NOT NULL,
+    DEC_INST_ID_ varchar(64) NOT NULL,
+    CLAUSE_ID_ varchar(64),
+    CLAUSE_NAME_ varchar(255),
+    RULE_ID_ varchar(64),
+    RULE_ORDER_ integer,
+    VAR_NAME_ varchar(255),
+    VAR_TYPE_ varchar(100),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(10000),
+    TEXT2_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    CREATE_TIME_ datetime(3),
+    ROOT_PROC_INST_ID_ varchar(64),
+    REMOVAL_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+
+create index ACT_IDX_HI_DEC_INST_ID on ACT_HI_DECINST(DEC_DEF_ID_);
+create index ACT_IDX_HI_DEC_INST_KEY on ACT_HI_DECINST(DEC_DEF_KEY_);
+create index ACT_IDX_HI_DEC_INST_PI on ACT_HI_DECINST(PROC_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_CI on ACT_HI_DECINST(CASE_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_ACT on ACT_HI_DECINST(ACT_ID_);
+create index ACT_IDX_HI_DEC_INST_ACT_INST on ACT_HI_DECINST(ACT_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_TIME on ACT_HI_DECINST(EVAL_TIME_);
+create index ACT_IDX_HI_DEC_INST_TENANT_ID on ACT_HI_DECINST(TENANT_ID_);
+create index ACT_IDX_HI_DEC_INST_ROOT_ID on ACT_HI_DECINST(ROOT_DEC_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_REQ_ID on ACT_HI_DECINST(DEC_REQ_ID_);
+create index ACT_IDX_HI_DEC_INST_REQ_KEY on ACT_HI_DECINST(DEC_REQ_KEY_);
+create index ACT_IDX_HI_DEC_INST_ROOT_PI on ACT_HI_DECINST(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_RM_TIME on ACT_HI_DECINST(REMOVAL_TIME_);
+
+
+create index ACT_IDX_HI_DEC_IN_INST on ACT_HI_DEC_IN(DEC_INST_ID_);
+create index ACT_IDX_HI_DEC_IN_CLAUSE on ACT_HI_DEC_IN(DEC_INST_ID_, CLAUSE_ID_);
+create index ACT_IDX_HI_DEC_IN_ROOT_PI on ACT_HI_DEC_IN(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_DEC_IN_RM_TIME on ACT_HI_DEC_IN(REMOVAL_TIME_);
+
+create index ACT_IDX_HI_DEC_OUT_INST on ACT_HI_DEC_OUT(DEC_INST_ID_);
+create index ACT_IDX_HI_DEC_OUT_RULE on ACT_HI_DEC_OUT(RULE_ORDER_, CLAUSE_ID_);
+create index ACT_IDX_HI_DEC_OUT_ROOT_PI on ACT_HI_DEC_OUT(ROOT_PROC_INST_ID_);
+create index ACT_IDX_HI_DEC_OUT_RM_TIME on ACT_HI_DEC_OUT(REMOVAL_TIME_);
+
diff --git a/plans/so/macroflow/config/override-files/api-handler-infra/onapheat/override.yaml b/plans/so/macroflow/config/override-files/api-handler-infra/onapheat/override.yaml
new file mode 100644 (file)
index 0000000..bdf5c4d
--- /dev/null
@@ -0,0 +1,133 @@
+server:
+    port: 8080
+    tomcat:
+        max-threads: 50
+ssl-enable: false
+
+mso:
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
+  logPath: logs
+  site-name: onapheat
+  adapters:
+    requestDb:
+      endpoint: http://request-db-adapter:8083
+      auth: Basic YnBlbDpwYXNzd29yZDEk
+  catalog:
+    db:
+      spring:
+        endpoint: http://catalog-db-adapter:8082
+  db:
+    auth: Basic YnBlbDpwYXNzd29yZDEk
+  config:
+    path: /src/main/resources/
+  infra:
+    default:
+      alacarte:
+        orchestrationUri: /mso/async/services/ALaCarteOrchestrator
+        recipeTimeout: 180
+        testApi: VNF_API
+      service:
+        macro:
+          default:
+            testApi: GR_API
+  camundaURL: http://bpmn-infra:8081
+  camundaAuth: AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A
+  async:
+    core-pool-size: 50
+    max-pool-size: 50
+    queue-capacity: 500
+  sdc:
+    client:
+      auth: F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862
+    activate:
+      instanceid: test
+      userid: cs0008
+    endpoint: http://c1.vm1.mso.simpledemo.onap.org:28090
+  tenant:
+    isolation:
+      retry:
+        count: 3
+  aai:
+    endpoint: https://aai-simulator:9993
+    auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
+  extApi:
+    endpoint: http://nbi.onap:8080/nbi/api/v3
+  so:
+    operational-environment:
+      dmaap:
+        username: testuser
+        password: VjR5NDcxSzA=
+        host: http://c1.vm1.mso.simpledemo.onap.org:28090
+        auth: 51EA5414022D7BE536E7516C4D1A6361416921849B72C0D6FC1C7F262FD9F2BBC2AD124190A332D9845A188AD80955567A4F975C84C221EEA8243BFD92FFE6896CDD1EA16ADD34E1E3D47D4A
+      publisher:
+        topic: com.att.ecomp.mso.operationalEnvironmentEvent
+  health:
+    auth: Basic bXNvX2FkbWlufHBhc3N3b3JkMSQ=
+    endpoints:
+      - subsystem: apih
+        uri: http://bpmn-infra:8081
+      - subsystem: catalogdb
+        uri: http://catalog-db-adapter:8082
+
+spring:
+  datasource:
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb
+      username: cataloguser
+      password: catalog123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: catdb-pool
+      registerMbeans: true
+  jpa:
+      show-sql: true
+      hibernate:
+        dialect: org.hibernate.dialect.MySQL5Dialect
+        ddl-auto: validate
+        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+        enable-lazy-load-no-trans: true
+  jersey:
+    type: filter
+
+  security:
+    usercredentials:
+    -
+      username: sitecontrol
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: SiteControl-Client
+    -
+      username: gui
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: GUI-Client
+    -
+      username: infraportal
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: InfraPortal-Client
+    -
+      username: InfraPortalClient
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: InfraPortal-Client
+    -
+      username: bpel
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPEL-Client
+    -
+      username: mso_admin
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: ACTUATOR
+
+request:
+  datasource:
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb
+      username: requestuser
+      password: request123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: reqdb-pool
+      registerMbeans: true
+org:
+  onap:
+    so:
+      cloud-owner: CloudOwner
+      adapters:
+        network:
+          encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
diff --git a/plans/so/macroflow/config/override-files/bpmn-infra/onapheat/override.yaml b/plans/so/macroflow/config/override-files/bpmn-infra/onapheat/override.yaml
new file mode 100644 (file)
index 0000000..3ca554d
--- /dev/null
@@ -0,0 +1,366 @@
+aai:
+  auth:  221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
+  dme2:
+    timeout: '30000'
+  endpoint: https://aai-simulator:9993
+  workflowAaiDistributionDelay: PT30S
+  pnfEntryNotificationTimeout: P14D
+cds:
+  endpoint: blueprints-processor
+  port: 9111
+  auth: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+  timeout: 60
+camunda:
+  bpm:
+    admin-user:
+      id: admin
+      password: so_Admin123
+    history-level: full
+    job-execution:
+      max-pool-size: 30
+      core-pool-size: 3
+entitymanager:
+  packagesToScan: com
+pnf:
+  dmaap:
+    host: message-router
+    port: 3904
+    protocol: http
+    uriPathPrefix: events
+    topicName: unauthenticated.PNF_READY
+    consumerGroup: consumerGroup
+    consumerId: consumerId
+    topicListenerDelayInSeconds: 5
+bpelURL: http://bpmn-infra:8081
+msb-ip: msb-iag
+msb-port: 80
+mso:
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
+  config:
+    path: /var/csar/
+  correlation:
+    timeout: 60
+  logPath: logs
+  async:
+    core-pool-size: 50
+    max-pool-size: 50
+    queue-capacity: 500
+  aai:
+    endpoint: https://aai-simulator:9993
+  adapters:
+    completemsoprocess:
+      endpoint:  http://bpmn-infra:8081/CompleteMsoProcess
+    requestDb:
+      endpoint: http://request-db-adapter:8083
+      auth: Basic YnBlbDpwYXNzd29yZDEk
+    db:
+      auth: 33293332AEC4930F655D8E2E8BB08937
+      password: wLg4sjrAFUS8rfVfdvTXeQ==
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter
+      spring:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083
+    network:
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/NetworkAdapter
+      rest:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/networks
+    openecomp:
+      db:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter
+    po:
+      auth: 33293332AEC4930F655D8E2E8BB08937
+      password: B8EBDE0311F0AF355CF3F2FD505A8CAD
+    sdnc:
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/SDNCAdapter
+      rest:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/v1/sdnc
+      timeout: PT60M
+    tenant:
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/TenantAdapter
+    vnf:
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapter
+      rest:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/vnfs
+    volume-groups:
+      rest:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/volume-groups
+    vnf-async:
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapterAsync
+    vfc:
+      rest:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8084/services/v1/vfcadapter
+    workflow:
+      message:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
+  bpmn:
+    process:
+      historyTimeToLive: '30'
+  callbackRetryAttempts: '5'
+  catalog:
+    db:
+      endpoint: http://catalog-db-adapter:8082/ecomp/mso/catalog
+      spring:
+        endpoint: http://catalog-db-adapter:8082
+  db:
+    auth: Basic YnBlbDpwYXNzd29yZDEk
+  default:
+    adapter:
+      namespace: http://org.onap.mso
+  healthcheck:
+    log:
+      debug: 'false'
+  infra:
+    customer:
+      id: testCustIdInfra
+  po:
+    timeout: PT60M
+  request:
+    db:
+      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/
+  rollback: 'true'
+  sdnc:
+    password: 3141634BF7E070AA289CF2892C986C0B
+  service:
+    agnostic:
+      sniro:
+        endpoint: /sniro/api/v2/placement
+        host: http://c1.vm1.mso.simpledemo.onap.org:30253
+  site-name: CamundaEngine
+  sniro:
+    auth: test:testpwd
+    callback: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/SDNCNotify
+    endpoint: http://replaceme:28090/optimizationInstance/V1/create
+    timeout: PT30M
+  oof:
+    auth: test:testpwd
+    callbackEndpoint: http://bpmn-infra:8081/mso/WorkflowMessage
+    endpoint: http://oof.api.simpledemo.openecomp.org:8698/api/oof/v1/placement
+    timeout: PT30M
+  workflow:
+    CreateGenericVNFV1:
+      aai:
+        volume-group:
+          uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group
+    default:
+      aai:
+        version: '14'
+        cloud-region:
+          version: '14'
+        generic-vnf:
+          version: '14'
+        v14:
+          customer:
+            uri: /aai/v14/business/customers/customer
+          generic-query:
+            uri: /aai/v14/search/generic-query
+          generic-vnf:
+            uri: /aai/v14/network/generic-vnfs/generic-vnf
+          l3-network:
+            uri: /aai/v14/network/l3-networks/l3-network
+          network-policy:
+            uri: /aai/v14/network/network-policies/network-policy
+          nodes-query:
+            uri: /aai/v14/search/nodes-query
+          route-table-reference:
+            uri: /aai/v14/network/route-table-references/route-table-reference
+          tenant:
+            uri: /aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant
+          vce:
+            uri: /aai/v14/network/vces/vce
+          vpn-binding:
+            uri: /aai/v14/network/vpn-bindings/vpn-binding
+          sp-partner:
+            uri: /aai/v14/business/sp-partners/sp-partner
+          device:
+            uri: /aai/v14/network/devices/device
+        v11:
+          customer:
+            uri: /aai/v11/business/customers/customer
+          generic-query:
+            uri: /aai/v11/search/generic-query
+          generic-vnf:
+            uri: /aai/v11/network/generic-vnfs/generic-vnf
+          l3-network:
+            uri: /aai/v11/network/l3-networks/l3-network
+          network-policy:
+            uri: /aai/v11/network/network-policies/network-policy
+          nodes-query:
+            uri: /aai/v11/search/nodes-query
+          route-table-reference:
+            uri: /aai/v11/network/route-table-references/route-table-reference
+          tenant:
+            uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant
+          vce:
+            uri: /aai/v11/network/vces/vce
+          vpn-binding:
+            uri: /aai/v11/network/vpn-bindings/vpn-binding
+        v8:
+          configuration:
+            uri: /aai/v11/network/configurations/configuration
+          customer:
+            uri: /aai/v8/business/customers/customer
+          generic-query:
+            uri: /aai/v8/search/generic-query
+          l3-network:
+            uri: /aai/v8/network/l3-networks/l3-network
+          network-policy:
+            uri: /aai/v8/network/network-policies/network-policy
+          nodes-query:
+            uri: /aai/v8/search/nodes-query
+          route-table-reference:
+            uri: /aai/v8/network/route-table-references/route-table-reference
+          tenant:
+            uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant
+          vce:
+            uri: /aai/v8/network/vces/vce
+          vpn-binding:
+            uri: /aai/v8/network/vpn-bindings/vpn-binding
+        v9:
+          cloud-region:
+            uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner
+          generic-vnf:
+            uri: /aai/v9/network/generic-vnfs/generic-vnf
+      retry:
+        attempts: '1'
+    deleteCinderVolumeV1:
+      aai:
+        volume-group:
+          uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group
+    global:
+      default:
+        aai:
+          namespace: http://org.onap.aai.inventory/
+          version: 14
+    message:
+      endpoint: http://bpmn-infra:8081/mso/WorkflowMessage
+    notification:
+      name: GenericNotificationServiceATT
+    sdnc:
+      replication:
+        delay: PT60S
+    sdncadapter:
+      callback: http://bpmn-infra:8081/mso/SDNCAdapterCallbackService
+    vnfadapter:
+      create:
+        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
+      delete:
+        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
+      query:
+        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
+      rollback:
+        callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
+  use:
+    qualified:
+      host: false
+  global:
+    dmaap:
+      username: testuser
+      password: alRyMzJ3NUNeakxl
+      host: http://10.42.111.36:904
+      publisher:
+        topic: replaceme
+  naming:
+    endpoint: http://naming.demo.onap.com:8081/web/service/v1/genNetworkElementName
+    auth: Basic bTA0NzY4QG5vbi1wcm9kLm1zby5lY29tcC5hdHQuY29tOkF0dG0wNDc2OExpZmUhQA==
+policy:
+  auth: Basic dGVzdHBkcDphbHBoYTEyMw==
+  default:
+    disposition: Skip
+  client:
+    auth: Basic bTAzNzQzOnBvbGljeVIwY2sk
+  endpoint: https://localhost:8081/pdp/api/
+  environment: TEST
+sdnc:
+  auth: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
+  host: http://sdnc-simulator:9994
+  path: /restconf/operations/GENERIC-RESOURCE-API
+  si:
+    svc:
+      types: PORT-MIRROR,PPROBE
+  dmaap:
+    host: ueb1.simpledemo.onap.org:3904
+    timeout: 30000
+  lcm:
+    path: '/restconf/operations/LCM:'
+    actionTimeout: 300000
+    dmapp:
+      readTopic: SDNC-LCM-WRITE
+      writeTopic: SDNC-LCM-READ
+appc:
+  client:
+    topic:
+      read:
+        name: APPC-LCM-WRITE
+        timeout: 360000
+      write: APPC-LCM-READ
+      sdnc:
+        read: SDNC-LCM-WRITE
+        write: SDNC-LCM-READ
+    response:
+      timeout: 360000
+    key: VIlbtVl6YLhNUrtU
+    secret: 64AG2hF4pYeG2pq7CT6XwUOT
+    service: ueb
+    poolMembers: ueb1.simpledemo.onap.org:3904,ueb2.simpledemo.onap.org:3904
+sniro:
+  conductor:
+    enabled: true
+    host: http://sniro-emulator:80
+    uri: /v1/release-orders
+    headers.auth: Basic dGVzdDp0ZXN0cHdk
+  manager:
+    timeout: PT30M
+    host: http://sniro-emulator:80
+    uri.v1: /sniro/api/v2/placement
+    uri.v2: /sniro/api/placement/v2
+    headers.auth: Basic dGVzdDp0ZXN0cHdk
+    headers.patchVersion: 1
+    headers.minorVersion: 1
+    headers.latestVersion: 2
+server:
+  port: 8081
+  tomcat:
+    max-threads: 50
+spring:
+  datasource:
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/camundabpmn
+      username: camundauser
+      password: camunda123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: bpmn-pool
+      registerMbeans: true
+  security:
+    usercredentials:
+    -
+      username: apihBpmn
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPMN-Client
+    -
+      username: sdncaBpmn
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPMN-Client
+    -
+      username: poBpmn
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPMN-Client
+    -
+      username: wmaBpmn
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPMN-Client
+    -
+      username: sniro
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: SNIRO-Client
+    -
+      username: mso_admin
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: ACTUATOR
+so:
+  vnfm:
+    adapter:
+      url: http://so-vnfm-adapter:9092/so/vnfm-adapter/v1/
+      auth: Basic dm5mbTpwYXNzd29yZDEk
+org:
+  onap:
+    so:
+      cloud-owner: CloudOwner
diff --git a/plans/so/macroflow/config/override-files/catalog-db-adapter/onapheat/override.yaml b/plans/so/macroflow/config/override-files/catalog-db-adapter/onapheat/override.yaml
new file mode 100644 (file)
index 0000000..934e8fb
--- /dev/null
@@ -0,0 +1,103 @@
+server:
+    port: 8082
+    tomcat:
+        max-threads: 50
+ssl-enable: false
+mso:
+  logPath: logs
+  site-name: onapheat
+  catalog:
+    db:
+      spring:
+        endpoint: http://catalog-db-adapter:8082
+  db:
+    auth: Basic YnBlbDpwYXNzd29yZDEk
+spring:
+  datasource:
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb
+      username: cataloguser
+      password: catalog123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: catdb-pool
+      registerMbeans: true
+  flyway:
+    baseline-on-migrate: false
+    url: jdbc:mariadb://mariadb:3306/catalogdb
+    user: cataloguser
+    password: catalog123
+    outOfOrder: true
+    validateOnMigrate: false
+  jpa:
+    generate-ddl: false
+    show-sql: false
+    hibernate:
+      ddl-auto: validate
+      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+      enable-lazy-load-no-trans: true
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  security:
+    usercredentials:
+    -
+      username: bpel
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPEL-Client
+    -
+      username: mso_admin
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: ACTUATOR
+#Actuator
+management:
+  context-path: /manage
+cloud_config:
+  identity_services:
+    RAX_KEYSTONE:
+      identity_url: "https://identity.api.rackspacecloud.com/v2.0"
+      mso_id: "RACKSPACE_ACCOUNT_ID"
+      mso_pass: "RACKSPACE_ACCOUNT_APIKEY"
+      admin_tenant: "dummy"
+      member_role: "admin"
+      tenant_metadata: true
+      identity_server_type: "KEYSTONE"
+      identity_authentication_type: "RACKSPACE_APIKEY"
+      project_domain_name: "PROJECT_DOMAIN_NAME"
+      user_domain_name: "USER_DOMAIN_NAME"
+    DEFAULT_KEYSTONE:
+      identity_url: "dummy"
+      mso_id: "dummy"
+      mso_pass: "dummy"
+      admin_tenant: "dummy"
+      member_role: "admin"
+      tenant_metadata: true
+      identity_server_type: "KEYSTONE"
+      identity_authentication_type: "USERNAME_PASSWORD"
+      project_domain_name: "dummy"
+      user_domain_name: "dummy"
+  cloud_sites:
+    Dallas:
+      region_id: "DFW"
+      clli: "DFW"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
+    Northern Virginia:
+      region_id: "IAD"
+      clli: "IAD"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
+    Chicago:
+      region_id: "ORD"
+      clli: "ORD"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
+    RegionOne:
+      region_id: "RegionOne"
+      clli: "RegionOne"
+      aic_version: "2.5"
+      identity_service_id: "DEFAULT_KEYSTONE"
+    DEFAULT:
+      region_id: "dummyRegionId"
+      clli: "dummyClli"
+      aic_version: "2.5"
+      identity_service_id: "DEFAULT_KEYSTONE"
+
+
diff --git a/plans/so/macroflow/config/override-files/openstack-adapter/onapheat/override.yaml b/plans/so/macroflow/config/override-files/openstack-adapter/onapheat/override.yaml
new file mode 100644 (file)
index 0000000..7e2afa8
--- /dev/null
@@ -0,0 +1,147 @@
+server:
+  port: 8087
+
+spring:
+  datasource:
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb
+      username: cataloguser
+      password: catalog123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: catdb-pool
+      registerMbeans: false
+
+  security:
+    usercredentials:
+    -
+      username: sdnc
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: SDNC-Client
+    -
+      username: sitecontrol
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: SiteControl-Client
+    -
+      username: bpel
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPEL-Client
+    -
+      username: sniro
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: SNIRO-Client
+    -
+      username: apih
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: MSO-Client
+    -
+      username: mso_admin
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: ACTUATOR
+
+
+org:
+  onap:
+    so:
+      adapters:
+        default_keystone_url_version: /v2.0
+        default_keystone_reg_ex: "/[vV][0-9]"
+        vnf:
+          bpelauth: D1A67FA93B6A6419132D0F83CC771AF774FD3C60853C50C22C8C6FC5088CC79E9E81EDE9EA39F22B2F66A0068E
+          checkRequiredParameters: true
+          addGetFilesOnVolumeReq: false
+          sockettimeout: 30
+          connecttimeout: 30
+          retrycount: 5
+          retryinterval: -15
+          retrylist: 408,429,500,502,503,504,900
+          valet_enabled: false
+          fail_requests_on_valet_failure: false
+        network:
+          bpelauth: D1A67FA93B6A6419132D0F83CC771AF774FD3C60853C50C22C8C6FC5088CC79E9E81EDE9EA39F22B2F66A0068E
+          sockettimeout: 5
+          connecttimeout: 5
+          retrycount: 5
+          retryinterval: -15
+          retrylist: 408,429,500,502,503,504,900
+          encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
+        tenant:
+          default_keystone_url_version: /v2.0
+          default_keystone_reg_ex: "/[vV][0-9]"
+          default_tenant_description: Tenant
+          default_region_type: single
+          default_user_role: admin
+          default_success_status_string: Success
+          default_no_regions_status_string: no regions
+          default_quota_value: 10
+          set_default_quota: false
+
+ecomp:
+  mso:
+    adapters:
+      po:
+        retryCodes: 504
+        retryDelay: 5
+        retryCount: 3
+        pollTimeout: 7500
+        pollInterval: 15
+
+mso:
+  adapters:
+    requestDb:
+      endpoint: http://so-request-db-adapter.onap:8083
+      auth: Basic YnBlbDpwYXNzd29yZDEk
+  auth: BEA8637716A7EB617DF472BA6552D22F68C1CB17B0D094D77DDA562F4ADAAC4457CAB848E1A4
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
+  logPath: ./logs/openstack
+  msb-ip: multicloud-simulator
+  msb-port: 9996
+  msb-scheme: http
+  workflow:
+    endpoint: http://bpmn-infra:8081/sobpmnengine
+  config:
+    cadi:
+      aafId: poBpmn
+  catalog:
+    db:
+      spring:
+        endpoint: http://catalog-db-adapter:8082
+  db:
+    auth: Basic YnBlbDpwYXNzd29yZDEk
+  site-name: localDevEnv
+  async:
+    core-pool-size: 50
+    max-pool-size: 50
+    queue-capacity: 500
+
+cloud_config:
+  identity_services:
+    RAX_KEYSTONE:
+      identity_url: "https://identity.api.rackspacecloud.com/v2.0"
+      mso_id: "RACKSPACE_ACCOUNT_ID"
+      mso_pass: "RACKSPACE_ACCOUNT_APIKEY"
+      admin_tenant: "service"
+      member_role: "admin"
+      tenant_metadata: true
+      identity_server_type: "KEYSTONE"
+      identity_authentication_type: "RACKSPACE_APIKEY"
+  cloud_sites:
+    Dallas:
+      region_id: "DFW"
+      clli: "DFW"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
+    Northern Virginia:
+      region_id: "IAD"
+      clli: "IAD"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
+    Chicago:
+      region_id: "ORD"
+      clli: "ORD"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
+    DEFAULT:
+      region_id: "DFW"
+      clli: "DFW"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
diff --git a/plans/so/macroflow/config/override-files/sdc-controller/onapheat/override.yaml b/plans/so/macroflow/config/override-files/sdc-controller/onapheat/override.yaml
new file mode 100644 (file)
index 0000000..ed8bd43
--- /dev/null
@@ -0,0 +1,81 @@
+aai:
+  auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
+server:
+  port: 8085
+
+spring:
+  datasource:
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb
+      username: cataloguser
+      password: catalog123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: catdb-pool
+      registerMbeans: false
+
+  security:
+    usercredentials:
+    -
+      username: asdc
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: Asdc-Client
+    -
+      username: mso_admin
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: ACTUATOR
+
+request:
+  datasource:
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb
+      username: requestuser
+      password: request123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: reqdb-pool
+      registerMbeans: false
+
+mso:
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
+  logPath: ./logs/asdc
+  catalog:
+    db:
+      spring:
+        endpoint: http://catalog-db-adapter:8082
+  db:
+    auth: Basic YnBlbDpwYXNzd29yZDEk
+  site-name: onapheat
+  camundaURL: http://bpmn-infra:8081/
+  adapters:
+    requestDb:
+      endpoint: http://request-db-adapter:8083
+      auth: Basic YnBlbDpwYXNzd29yZDEk
+  aai:
+    endpoint: https://aai.api.simpledemo.onap.org:8443
+  asdc-connections:
+    asdc-controller1:
+      user: mso
+      consumerGroup: SO-OpenSource-Env11
+      consumerId: SO-COpenSource-Env11
+      environmentName: AUTO
+      asdcAddress: c2.vm1.sdc.simpledemo.onap.org:8443
+      password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
+      pollingInterval: 60
+      pollingTimeout: 60
+      relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL
+      useHttpsWithDmaap: false
+      activateServerTLSAuth: false
+      keyStorePassword:
+      keyStorePath:
+      watchDogTimeout: 100
+      isFitlerInEmptyResources: true
+      messageBusAddress: vm1.mr.simpledemo.onap.org,vm1.mr.simpledemo.onap.org
+  asdc:
+    config:
+      activity:
+        endpoint: http://sdc-wfd-be:8080
+      key: 566B754875657232314F5548556D3665
+      components:
+        count: 0,
+        componentNames:
+  scheduling:
+    enabled: false
diff --git a/plans/so/macroflow/config/override-files/so-monitoring/onapheat/override.yaml b/plans/so/macroflow/config/override-files/so-monitoring/onapheat/override.yaml
new file mode 100644 (file)
index 0000000..7e61c7d
--- /dev/null
@@ -0,0 +1,24 @@
+server:
+  port: 30224
+  tomcat:
+    max-threads: 4
+ssl-enable: false
+camunda:
+  rest:
+    api:
+      url: http://bpmn-infra:8081/sobpmnengine/engine/
+      engine: default
+      auth: Basic YXBpaEJwbW46cGFzc3dvcmQxJA==
+mso:
+  database:
+    rest:
+      api:
+        url: http://request-db-adapter:8083/infraActiveRequests/
+        auth: Basic YnBlbDpwYXNzd29yZDEk
+spring:
+ security:
+   usercredentials:
+   -
+     username: gui
+     password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+     role: GUI-Client
diff --git a/plans/so/macroflow/config/override-files/so-vnfm-adapter/onapheat/override.yaml b/plans/so/macroflow/config/override-files/so-vnfm-adapter/onapheat/override.yaml
new file mode 100644 (file)
index 0000000..b029bd7
--- /dev/null
@@ -0,0 +1,33 @@
+server:
+    port: 9092
+    tomcat:
+        max-threads: 4
+aai:
+  auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
+  version: v15
+  endpoint:  https://aai-simulator:9993
+spring:
+  security:
+    usercredentials:
+    - username: vnfm
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPEL-Client
+    - username: mso_admin
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: ACTUATOR
+mso:
+  key: 07a7159d3bf51a0e53be7a8f89699be7
+  site-name: localSite
+  logPath: ./logs/vnfm-adapter
+sdc:
+  username: mso
+  password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
+  key: 566B754875657232314F5548556D3665
+  endpoint: http://sdc-simulator:9991/
+  toscametapath: Artifacts/Deployment/OTHER/TOSCA.meta
+vnfmadapter:
+  endpoint: http://so-vnfm-adapter:9092
+etsi-catalog-manager:
+  vnfpkgm:
+    endpoint: http://modeling-etsicatalog:8806/api/vnfpkgm/v1
+
diff --git a/plans/so/macroflow/config/override-files/vnfm-simulator/onapheat/override.yaml b/plans/so/macroflow/config/override-files/vnfm-simulator/onapheat/override.yaml
new file mode 100644 (file)
index 0000000..05cb1e5
--- /dev/null
@@ -0,0 +1,56 @@
+spring:
+ h2:
+  console:
+  enabled: true
+  path: console
+ datasource:
+  url: jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+  username: admin
+  password: admin
+ http:
+  converters:
+   preferred-json-mapper: gson
+ security:
+  usercredentials:
+   - username: vnfm
+     password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+     role: BPEL-Client
+
+server:
+  port: 9093
+  tomcat:
+    max-threads: 50
+  ssl:
+    client-auth: need
+    key-alias: so@so.onap.org
+    key--store-password: '7Em3&j4.19xYiMelhD5?xbQ.'
+    key-store: classpath:so-vnfm-simulator.p12
+    key-store-type: PKCS12
+  request:
+    grant:
+      auth: twowaytls
+  dns:
+    name: so-vnfm-simulator
+
+vnfds:
+  vnfdlist:
+  -  vnfdid: sgsn-mme_12df452s04131
+     vnfclist:
+     - vnfcid: VNFC1
+       resourceTemplateId: vnfd1_vnfc1
+       vduId: vnfd1_vduForVnfc1
+       type: COMPUTE
+     - vnfcid: VNFC2
+       resourceTemplateId: vnfd1_vnfc2
+       vduId: vnfd1_vduForVnfc2
+       type: COMPUTE
+  -  vnfdid: 2
+     vnfclist:
+     - vnfcid: VNFC3
+       resourceTemplateId: vnfd2_vnfc3
+       vduId: vnfd2_vduForVnfc3
+       type: COMPUTE
+     - vnfcid: VNFC4
+       resourceTemplateId: vnfd2_vnfc4
+       vduId: vnfd2_vduForVnfc4
+       type: COMPUTE
diff --git a/plans/so/macroflow/docker-compose.local.yml b/plans/so/macroflow/docker-compose.local.yml
new file mode 100644 (file)
index 0000000..281a516
--- /dev/null
@@ -0,0 +1,30 @@
+version: '3'
+services:
+################################################################################
+  mariadb:
+    image: mariadb:${MARIADB_VERSION}
+################################################################################
+  catalog-db-adapter:
+    image: onap/so/catalog-db-adapter:${TAG}
+################################################################################
+  request-db-adapter:
+    image: onap/so/request-db-adapter:${TAG}
+################################################################################
+  sdnc-adapter:
+    image: onap/so/sdnc-adapter:${TAG}
+################################################################################
+  openstack-adapter:
+    image: onap/so/openstack-adapter:${TAG}
+################################################################################
+  sdc-controller:
+    image: onap/so/sdc-controller:${TAG}
+################################################################################
+  bpmn-infra:
+    image: onap/so/bpmn-infra:${TAG}
+################################################################################
+  api-handler-infra:
+    image: onap/so/api-handler-infra:${TAG}
+#############################################################################
+  so-monitoring:
+    image: onap/so/so-monitoring:${TAG}
+################################################################################
diff --git a/plans/so/macroflow/docker-compose.yml b/plans/so/macroflow/docker-compose.yml
new file mode 100644 (file)
index 0000000..8cc1c7b
--- /dev/null
@@ -0,0 +1,346 @@
+version: '3'
+services:
+################################################################################
+  mariadb:
+    image: ${NEXUS_DOCKER_REPO_MSO}/mariadb:${MARIADB_VERSION}
+    ports:
+      - "3306:3306"
+    volumes:
+      - ${TEST_LAB_DIR}/volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+      - ${TEST_LAB_DIR}/volumes/mariadb/conf.d:/etc/mysql/conf.d
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+    hostname:
+      mariadb.so.testlab.onap.org
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+################################################################################
+  catalog-db-adapter:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/catalog-db-adapter:${TAG}
+    ports:
+      - "8082:8082"
+    volumes:
+      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+      - ${CONFIG_DIR_PATH_MACRO}/override-files/catalog-db-adapter/onapheat:/app/config
+    environment:
+      - APP=catalog-db-adapter
+      - JVM_ARGS=-Xms64m -Xmx512m
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
+    hostname:
+      catalog-db-adapter.so.testlab.onap.org
+    depends_on:
+      - mariadb
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" mariadb:3306 -- "/app/start-app.sh"'
+################################################################################
+  request-db-adapter:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/request-db-adapter:${TAG}
+    ports:
+      - "8083:8083"
+    volumes:
+      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+      - ${TEST_LAB_DIR}/volumes/so/config/request-db-adapter/onapheat:/app/config
+    environment:
+      - APP=request-db-adapter
+      - JVM_ARGS=-Xms64m -Xmx512m
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
+    hostname:
+      request-db-adapter.so.testlab.onap.org
+    depends_on:
+      - mariadb
+      - catalog-db-adapter
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" catalog-db-adapter:8082 -- "/app/start-app.sh"'
+################################################################################
+  sdnc-adapter:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdnc-adapter:${TAG}
+    ports:
+      - "8086:8086"
+    volumes:
+      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+      - ${TEST_LAB_DIR}/volumes/so/config/sdnc-adapter/onapheat:/app/config
+    environment:
+      - APP=sdnc-adapter
+      - JVM_ARGS=-Xms64m -Xmx512m
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
+    hostname:
+      sdnc-adapter.so.testlab.onap.org
+    depends_on:
+      - mariadb
+      - catalog-db-adapter
+      - request-db-adapter
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
+################################################################################
+  openstack-adapter:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/openstack-adapter:${TAG}
+    ports:
+      - "8087:8087"
+    volumes:
+      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+      - ${CONFIG_DIR_PATH_MACRO}/override-files/openstack-adapter/onapheat:/app/config
+    environment:
+      - APP=openstack-adapter
+      - JVM_ARGS=-Xms64m -Xmx512m
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
+    hostname:
+      openstack-adapter.so.testlab.onap.org
+    depends_on:
+      - mariadb
+      - catalog-db-adapter
+      - request-db-adapter
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
+################################################################################
+  sdc-controller:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdc-controller:${TAG}
+    ports:
+      - "8085:8085"
+    volumes:
+      - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+      - ${CONFIG_DIR_PATH_MACRO}/distribution-test-zip:/distribution-test-zip
+      - ${CONFIG_DIR_PATH_MACRO}/override-files/sdc-controller/onapheat:/app/config
+    environment:
+      - APP=sdc-controller
+      - JVM_ARGS=-Xms64m -Xmx512m
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
+    hostname:
+      sdc-controller.so.testlab.onap.org
+    depends_on:
+      - mariadb
+      - catalog-db-adapter
+      - request-db-adapter
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    user: root
+    entrypoint: /bin/sh -c 'mkdir -p /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/macro_zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && chmod 777 -R /distribution-test-zip/ && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
+################################################################################
+  bpmn-infra:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/bpmn-infra:${TAG}
+    ports:
+      - "8081:8081"
+    volumes:
+      - ${CONFIG_DIR_PATH_MACRO}/override-files/bpmn-infra/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/certificates/bpmn-infra-certs:/app/bpmn-infra-certs
+      - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
+    environment:
+      - APP=bpmn-infra
+      - JVM_ARGS=-Xms64m -Xmx512m
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
+    hostname:
+      bpmn-infra.so.testlab.onap.org
+    depends_on:
+      - mariadb
+      - catalog-db-adapter
+      - request-db-adapter
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
+################################################################################
+  api-handler-infra:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/api-handler-infra:${TAG}
+    ports:
+      - "8080:8080"
+    volumes:
+      - ${CONFIG_DIR_PATH_MACRO}/override-files/api-handler-infra/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
+    environment:
+      - APP=api-handler-infra
+      - JVM_ARGS=-Xms64m -Xmx512m
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
+    hostname:
+      api-handler-infra.so.testlab.onap.org
+    depends_on:
+      - mariadb
+      - catalog-db-adapter
+      - request-db-adapter
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
+#############################################################################
+  so-monitoring:
+    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-monitoring:${TAG}
+    ports:
+      - "30224:30224"
+    volumes:
+      - ${CONFIG_DIR_PATH_MACRO}/override-files/so-monitoring/onapheat:/app/config
+    environment:
+      - APP=so-monitoring
+      - JVM_ARGS=-Xms64m -Xmx512m
+    hostname:
+      so-monitoring.so.testlab.onap.org
+    depends_on:
+      - mariadb
+      - catalog-db-adapter
+      - request-db-adapter
+################################################################################
+  sdc-simulator:
+    image: simulators/sdc-simulator:latest
+    ports:
+      - "9991:9991"
+    environment:
+    - APP=SDC-SIMULATOR
+    - JVM_ARGS=-Xms64m -Xmx512m
+    hostname:
+      sdc-simulator
+    depends_on:
+      - mariadb      
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+################################################################################
+  aai-simulator:
+    image: simulators/aai-simulator:latest
+    ports:
+      - "9993:9993"
+    environment:
+    - APP=AAI-SIMULATOR
+    - JVM_ARGS=-Xms64m -Xmx512m
+    hostname:
+      aai-simulator
+    depends_on:
+      - mariadb      
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+################################################################################
+  workaround-config:
+    image: jobs/workaround-job-container:latest
+    ports:
+       - "9990:9990"
+    volumes:
+      - ${CONFIG_DIR_PATH}/apply-workarounds.sh:/config/apply-workarounds.sh
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - CATALOG_DB=catalogdb
+    depends_on:
+      - mariadb      
+    command:
+      - "/config/apply-workarounds.sh"
+#################################################################################
+  sdnc-simulator:
+    image: simulators/sdnc-simulator:latest
+    ports:
+      - "9994:9994"
+    environment:
+    - APP=SDNC-SIMULATOR
+    - JVM_ARGS=-Xms64m -Xmx512m
+    hostname:
+      sdnc-simulator
+    depends_on:
+      - mariadb      
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+#################################################################################
+  multicloud-simulator:
+    image: simulators/multicloud-simulator:latest
+    ports:
+    - "9996:9996"
+    environment:
+    - APP=MULTICLOUD-SIMULATOR
+    - JVM_ARGS=-Xms64m -Xmx512m
+    hostname:
+      multicloud-simulator
+    depends_on:
+    - mariadb    
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+################################################################################
+  populate-aai-config:
+    image: jobs/workaround-job-container:latest
+    ports:
+       - "9995:9995"
+    volumes:
+      - ${CONFIG_DIR_PATH}/populate-aai-simulator.sh:/config/populate-aai-simulator.sh
+      - ${CONFIG_DIR_PATH}/wait-for.sh:/config/wait-for.sh
+      - ${CONFIG_DIR_PATH}/aai-simulator-populate-data:/config/aai-simulator-populate-data/
+    environment:
+      - AAI_SIMULATOR_HOST=aai-simulator
+      - AAI_SIMULATOR_PORT=9993
+      - TIMEOUT_IN_SECONDS=300 #5 mins
+    depends_on:
+      - aai-simulator
+    command:
+        - "/config/populate-aai-simulator.sh"
+################################################################################
index 8255562..932eea0 100644 (file)
@@ -1,46 +1,63 @@
 #!/bin/bash
+#
+# ============LICENSE_START=======================================================
+# Copyright 2021 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
 
 MAVEN_VERSION_DIR="apache-maven-3.3.9"
 MAVEN_TAR_FILE="$MAVEN_VERSION_DIR-bin.tar.gz"
 MAVEN_TAR_LOCATION="https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/$MAVEN_TAR_FILE"
 
-# SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# Integration-Etsi Path
-SCRIPT_HOME=$WORKSPACE/plans/so/integration-etsi-testing
+# Macroflow
+SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 SCRIPT_NAME=$(basename $0)
-CONFIG_DIR=$SCRIPT_HOME/config
-ENV_FILE=$CONFIG_DIR/env
-TEMP_DIR_PATH=$SCRIPT_HOME/temp
-TEST_LAB_DIR_PATH=$TEMP_DIR_PATH/test_lab
+CONFIG_DIR_MACRO=$SCRIPT_HOME/config
+ENV_FILE=$CONFIG_DIR_MACRO/env
+SQL_PATH=$SCRIPT_HOME/cloud_owner_sql
 DOCKER_COMPOSE_FILE_PATH=$SCRIPT_HOME/docker-compose.yml
 DOCKER_COMPOSE_LOCAL_OVERRIDE_FILE=$SCRIPT_HOME/docker-compose.local.yml
 TEAR_DOWN_SCRIPT=$SCRIPT_HOME/teardown.sh
-CAMUNDA_SQL_SCRIPT_NAME=mariadb_engine_7.10.0.sql
-CAMUNDA_SQL_SCRIPT_DIR=$CONFIG_DIR/camunda-sql
+TEMP_DIR_PATH=$SCRIPT_HOME/temp
+TEST_LAB_DIR_PATH=$TEMP_DIR_PATH/test_lab
+
+#CAMUNDA SQL SCRIPTS
 TEST_LAB_SQL_SCRIPTS_DIR=$TEST_LAB_DIR_PATH/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts
+CAMUNDA_SQL_SCRIPT_NAME=mariadb_engine_7.10.0.sql
+
+# INTEGRATION_ETSI
+INTEGRATION_ETSI_TESTING_DIR=$WORKSPACE/plans/so/integration-etsi-testing
+INTEGRATION_ETSI_TESTING_CONFIG_DIR=$INTEGRATION_ETSI_TESTING_DIR/config
 
 MAVEN_DIR=$TEMP_DIR_PATH/maven
 INSTALLED_MAVEN_DIR=$MAVEN_DIR/$MAVEN_VERSION_DIR
 MVN=$INSTALLED_MAVEN_DIR/bin/mvn
 MVN_VERSION="$MVN -v"
-MVN_SETTINGS_XML="$SCRIPT_HOME/settings.xml"
+MVN_SETTINGS_XML="$INTEGRATION_ETSI_TESTING_DIR/settings.xml"
 MVN_CLEAN_INSTALL="$MVN clean install"
-SIMULATOR_MAVEN_PROJECT_POM="$SCRIPT_HOME/so-simulators/pom.xml"
-WAIT_FOR_WORKAROUND_SCRIPT=$CONFIG_DIR/"wait-for-workaround-job.sh"
-WAIT_FOR_POPULATE_AAI_SCRIPT=$CONFIG_DIR/"wait-for-aai-config-job.sh"
-WAIT_FOR_CONTAINER_SCRIPT=$CONFIG_DIR/"wait-for-container.sh"
-
-# Macroflow Path
-MACRO_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SQL_PATH=$MACRO_HOME/cloud_owner_sql
-
-
+SIMULATOR_MAVEN_PROJECT_POM="$INTEGRATION_ETSI_TESTING_DIR/so-simulators/pom.xml"
+WAIT_FOR_WORKAROUND_SCRIPT=$INTEGRATION_ETSI_TESTING_CONFIG_DIR/"wait-for-workaround-job.sh"
+WAIT_FOR_POPULATE_AAI_SCRIPT=$INTEGRATION_ETSI_TESTING_CONFIG_DIR/"wait-for-aai-config-job.sh"
+WAIT_FOR_CONTAINER_SCRIPT=$INTEGRATION_ETSI_TESTING_CONFIG_DIR/"wait-for-container.sh"
 
 echo "Running $SCRIPT_HOME/$SCRIPT_NAME ..."
 
 export $(egrep -v '^#' $ENV_FILE | xargs)
 
-MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME", "ETSI_CATALOG_IMAGE_VERSION", "SOL_003_ADAPTER_IMAGE_VERSION", "ETSI_NFVO_NS_LCM_IMAGE_VERSION", "MARIADB_VERSION")
+MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME")
 
 for var in "${MANDATORY_VARIABLES_NAMES[@]}"
  do
@@ -129,10 +146,11 @@ git clone http://gerrit.onap.org/r/so/docker-config.git $TEST_LAB_DIR_PATH
 
 echo "Replacing $CAMUNDA_SQL_SCRIPT_NAME ..."
 rm -rf $TEST_LAB_SQL_SCRIPTS_DIR/$CAMUNDA_SQL_SCRIPT_NAME
-cp $CAMUNDA_SQL_SCRIPT_DIR/$CAMUNDA_SQL_SCRIPT_NAME $TEST_LAB_SQL_SCRIPTS_DIR
+cp $CONFIG_DIR_MACRO/$CAMUNDA_SQL_SCRIPT_NAME $TEST_LAB_SQL_SCRIPTS_DIR
 
 export TEST_LAB_DIR=$TEST_LAB_DIR_PATH
-export CONFIG_DIR_PATH=$CONFIG_DIR
+export CONFIG_DIR_PATH=$INTEGRATION_ETSI_TESTING_CONFIG_DIR
+export CONFIG_DIR_PATH_MACRO=$CONFIG_DIR_MACRO
 
 if [ "$DOCKER_ENVIRONMENT" == "remote" ]; then
   echo "Starting docker containers with remote images ..."
@@ -148,11 +166,6 @@ fi
 echo "Sleeping for 3m"
 sleep 3m
 
-docker ps -a
-export SQL_DIR_PATH=$SQL_PATH
-docker cp $SQL_DIR_PATH/cloud_owner.sql $(docker container ls | grep mariadb | awk '{ print $1 }'):/
-docker exec $(docker container ls | grep mariadb | awk '{ print $1 }') sh -c 'mysql -u root -ppassword <  /cloud_owner.sql'
-
 echo "Will execute $WAIT_FOR_WORKAROUND_SCRIPT script"
 $WAIT_FOR_WORKAROUND_SCRIPT
 
index 8296688..248ecff 100644 (file)
@@ -1,23 +1,43 @@
 #!/bin/bash
+#
+# ============LICENSE_START=======================================================
+# Copyright 2021 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
 
-# SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SCRIPT_HOME=$WORKSPACE/plans/so/integration-etsi-testing
+INTEGRATION_ETSI_TESTING_DIR=$WORKSPACE/plans/so/integration-etsi-testing
+INTEGRATION_ETSI_TESTING_CONFIG_DIR=$INTEGRATION_ETSI_TESTING_DIR/config
+
+# Macroflow Path
+SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 SCRIPT_NAME=$(basename $0)
-CONFIG_DIR=$SCRIPT_HOME/config
-ENV_FILE=$CONFIG_DIR/env
-TEMP_DIR_PATH=$SCRIPT_HOME/temp
-TEST_LAB_DIR_PATH=$TEMP_DIR_PATH/test_lab
+CONFIG_DIR_MACRO=$SCRIPT_HOME/config
+ENV_FILE=$CONFIG_DIR_MACRO/env
 DOCKER_COMPOSE_FILE_PATH=$SCRIPT_HOME/docker-compose.yml
 DOCKER_COMPOSE_LOCAL_OVERRIDE_FILE=$SCRIPT_HOME/docker-compose.local.yml
 
+TEMP_DIR_PATH=$MACRO_HOME/temp
+TEST_LAB_DIR_PATH=$TEMP_DIR_PATH/test_lab
 
 echo "Running $SCRIPT_HOME/$SCRIPT_NAME ..."
 export $(egrep -v '^#' $ENV_FILE | xargs)
 export TEST_LAB_DIR=$TEST_LAB_DIR_PATH
-export CONFIG_DIR_PATH=$CONFIG_DIR
+export CONFIG_DIR_PATH=$INTEGRATION_ETSI_TESTING_CONFIG_DIR
+export CONFIG_DIR_PATH_MACRO=$CONFIG_DIR_MACRO
 
-echo "Sleeping 2m for completing the macroflow task"
-sleep 2m
 
 if [ "$DOCKER_ENVIRONMENT" == "remote" ]; then
   echo "Tearing down docker containers from remote images ..."
diff --git a/scripts/optf-has/has/has-properties/AAF_RootCA.cer b/scripts/optf-has/has/has-properties/AAF_RootCA.cer
deleted file mode 100644 (file)
index e9a50d7..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV
-BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx
-NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK
-DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7
-XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn
-H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM
-pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7
-NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg
-2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY
-wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd
-ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM
-P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6
-aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY
-PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G
-A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ
-UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN
-BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz
-L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9
-7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx
-c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf
-jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2
-RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h
-PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF
-CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+
-Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A
-cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR
-ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX
-dYY=
------END CERTIFICATE-----
diff --git a/scripts/optf-has/has/has-properties/conductor.conf.onap b/scripts/optf-has/has/has-properties/conductor.conf.onap
deleted file mode 100644 (file)
index b8b0a0a..0000000
+++ /dev/null
@@ -1,635 +0,0 @@
-[DEFAULT]
-
-#
-# From conductor
-#
-
-# Configuration file for WSGI definition of API. (string value)
-api_paste_config = /usr/local/etc/conductor/api_paste.ini
-
-# Music keyspace for content (string value)
-#keyspace = conductor
-
-# Delay time (Seconds) for MUSIC requests. Set it to 2 seconds by default.
-# (integer value)
-#delay_time = 2
-
-# (boolean value)
-#HPA_enabled = true
-
-#
-# From oslo.log
-#
-
-# If set to true, the logging level will be set to DEBUG instead of the default
-# INFO level. (boolean value)
-# Note: This option can be changed without restarting.
-debug = true
-
-# The name of a logging configuration file. This file is appended to any
-# existing logging configuration files. For details about logging configuration
-# files, see the Python logging module documentation. Note that when logging
-# configuration files are used then all logging configuration is set in the
-# configuration file and other logging configuration options are ignored (for
-# example, logging_context_format_string). (string value)
-# Note: This option can be changed without restarting.
-# Deprecated group/name - [DEFAULT]/log_config
-log_config_append = /usr/local/bin/log.conf
-
-# Defines the format string for %%(asctime)s in log records. Default:
-# %(default)s . This option is ignored if log_config_append is set. (string
-# value)
-#log_date_format = %Y-%m-%d %H:%M:%S
-
-# (Optional) Name of log file to send logging output to. If no default is set,
-# logging will go to stderr as defined by use_stderr. This option is ignored if
-# log_config_append is set. (string value)
-# Deprecated group/name - [DEFAULT]/logfile
-#log_file = application.log
-
-# (Optional) The base directory used for relative log_file  paths. This option
-# is ignored if log_config_append is set. (string value)
-# Deprecated group/name - [DEFAULT]/logdir
-log_dir = /var/log
-
-# Uses logging handler designed to watch file system. When log file is moved or
-# removed this handler will open a new log file with specified path
-# instantaneously. It makes sense only if log_file option is specified and
-# Linux platform is used. This option is ignored if log_config_append is set.
-# (boolean value)
-#watch_log_file = false
-
-# Use syslog for logging. Existing syslog format is DEPRECATED and will be
-# changed later to honor RFC5424. This option is ignored if log_config_append
-# is set. (boolean value)
-#use_syslog = false
-
-# Enable journald for logging. If running in a systemd environment you may wish
-# to enable journal support. Doing so will use the journal native protocol
-# which includes structured metadata in addition to log messages.This option is
-# ignored if log_config_append is set. (boolean value)
-#use_journal = false
-
-# Syslog facility to receive log lines. This option is ignored if
-# log_config_append is set. (string value)
-#syslog_log_facility = LOG_USER
-
-# Use JSON formatting for logging. This option is ignored if log_config_append
-# is set. (boolean value)
-#use_json = false
-
-# Log output to standard error. This option is ignored if log_config_append is
-# set. (boolean value)
-#use_stderr = false
-
-# Format string to use for log messages with context. (string value)
-#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
-
-# Format string to use for log messages when context is undefined. (string
-# value)
-#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
-
-# Additional data to append to log message when logging level for the message
-# is DEBUG. (string value)
-#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d
-
-# Prefix each line of exception output with this format. (string value)
-#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s
-
-# Defines the format string for %(user_identity)s that is used in
-# logging_context_format_string. (string value)
-#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s
-
-# List of package logging levels in logger=LEVEL pairs. This option is ignored
-# if log_config_append is set. (list value)
-#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,oslo_messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO
-
-# Enables or disables publication of error events. (boolean value)
-#publish_errors = false
-
-# The format for an instance that is passed with the log message. (string
-# value)
-#instance_format = "[instance: %(uuid)s] "
-
-# The format for an instance UUID that is passed with the log message. (string
-# value)
-#instance_uuid_format = "[instance: %(uuid)s] "
-
-# Interval, number of seconds, of log rate limiting. (integer value)
-#rate_limit_interval = 0
-
-# Maximum number of logged messages per rate_limit_interval. (integer value)
-#rate_limit_burst = 0
-
-# Log level name used by rate limiting: CRITICAL, ERROR, INFO, WARNING, DEBUG
-# or empty string. Logs with level greater or equal to rate_limit_except_level
-# are not filtered. An empty string means that all levels are filtered. (string
-# value)
-#rate_limit_except_level = CRITICAL
-
-# Enables or disables fatal status of deprecations. (boolean value)
-#fatal_deprecations = false
-
-
-[auth]
-# appkey = h@ss3crtky400fdntc#001
-appkey =
-
-[aaf_api]
-
-#
-# From conductor
-#
-
-# is_aaf_enabled. (boolean value)
-#is_aaf_enabled = true
-
-# aaf_cache_expiry_hrs. (integer value)
-#aaf_cache_expiry_hrs = 3
-
-# aaf_url. (string value)
-aaf_url = http://localhost:8100/authz/perms/user/
-
-# aaf_cert_file. (string value)
-#aaf_cert_file = <None>
-
-# aaf_cert_key_file. (string value)
-#aaf_cert_key_file = <None>
-
-# aaf_ca_bundle_file. (string value)
-#aaf_ca_bundle_file =
-aaf_ca_bundle_file = /usr/local/bin/AAF_RootCA.cer
-
-# aaf_retries. (integer value)
-#aaf_retries = 3
-
-# aaf_timeout. (integer value)
-#aaf_timeout = 100
-
-# aaf_user_roles. (list value)
-#aaf_permissions = {"type": "org.onap.oof.access","instance": "*","action": "*"}
-
-
-[aaf_sms]
-
-#
-# From conductor
-#
-
-# Is Secret Management service enabled (boolean value)
-#is_enabled = true
-
-# Base URL for SMS, up to and not including the version, and without a trailing
-# slash. (string value)
-aaf_sms_url = http://aaf-sms.onap:10443
-
-# Timeout for SMS API Call (integer value)
-#aaf_sms_timeout = 30
-
-# Path to the cacert that will be used to verify If this is None, verify will
-# be False and the server certis not verified by the client. (string value)
-#aaf_ca_certs = AAF_RootCA.cer
-aaf_ca_certs = /usr/local/bin/AAF_RootCA.cer
-
-# Domain Name for HAS (string value)
-#secret_domain = has
-
-
-[aai]
-
-#
-# From conductor
-#
-
-# Interval with which to refresh the local cache, in minutes. (integer value)
-#cache_refresh_interval = 1440
-cache_refresh_interval = 1
-
-# Interval with which to refresh the local complex cache, in minutes. (integer
-# value)
-#complex_cache_refresh_interval = 1440
-complex_cache_refresh_interval = 60
-
-# Data Store table prefix. (string value)
-#table_prefix = aai
-
-# Base URL for A&AI, up to and not including the version, and without a
-# trailing slash. (string value)
-#server_url = https://controller:8443/aai
-server_url = http://localhost:8081/aai/
-
-# Timeout for A&AI Rest Call (string value)
-#aai_rest_timeout = 30
-
-# Number of retry for A&AI Rest Call (string value)
-#aai_retries = 3
-
-# The version of A&AI in v# format. (string value)
-server_url_version = v14
-
-# SSL/TLS certificate file in pem format. This certificate must be registered
-# with the A&AI endpoint. (string value)
-#certificate_file = certificate.pem
-certificate_file =
-
-# Private Certificate Key file in pem format. (string value)
-#certificate_key_file = certificate_key.pem
-certificate_key_file =
-
-# Certificate Authority Bundle file in pem format. Must contain the appropriate
-# trust chain for the Certificate file. (string value)
-#certificate_authority_bundle_file = certificate_authority_bundle.pem
-certificate_authority_bundle_file = /usr/local/bin/AAF_RootCA.cer
-
-[api]
-
-#
-# From conductor
-#
-
-# Toggle Pecan Debug Middleware. (boolean value)
-#pecan_debug = false
-
-# Default maximum number of items returned by API request. (integer value)
-# Minimum value: 1
-#default_api_return_limit = 100
-
-
-[conductor_api]
-
-#
-# From conductor
-#
-
-# Base URL for plans. (string value)
-#server_url =
-
-# auth toggling. (boolean value)
-basic_auth_secure = false
-
-
-[controller]
-
-#
-# From conductor
-#
-
-# Timeout for planning requests. Default value is 10. (integer value)
-# Minimum value: 1
-#timeout = 10
-
-# Maximum number of result sets to return. Default value is 1. (integer value)
-# Minimum value: 1
-#limit = 1
-
-# Number of workers for controller service. Default value is 1. (integer value)
-# Minimum value: 1
-#workers = 1
-
-# Set to True when controller will run in active-active mode. When set to
-# False, controller will flush any abandoned messages at startup. The
-# controller always restarts abandoned template translations at startup.
-# (boolean value)
-#concurrent = false
-concurrent = true
-
-# Time between checking for new plans. Default value is 1. (integer value)
-# Minimum value: 1
-#polling_interval = 1
-opt_schema_file = /opt/has/conductor/etc/conductor/opt_schema.json
-
-# (integer value)
-# Minimum value: 1
-#max_translation_counter = 1
-
-
-[data]
-
-#
-# From conductor
-#
-
-# Number of workers for data service. Default value is 1. (integer value)
-# Minimum value: 1
-#workers = 1
-
-# Set to True when data will run in active-active mode. When set to False, data
-# will flush any abandoned messages at startup. (boolean value)
-#concurrent = false
-concurrent = true
-
-# Default value is -8000, which is the diameter of the earth. The distance
-# cannot larger than this value (floating point value)
-#existing_placement_cost = -8000.0
-
-# (floating point value)
-#cloud_candidate_cost = 2.0
-
-# (floating point value)
-#service_candidate_cost = 1.0
-
-
-[inventory_provider]
-
-#
-# From conductor
-#
-
-# Extensions list to use (list value)
-extensions = aai,generator
-
-
-[messaging_server]
-
-#
-# From conductor
-#
-
-# Music keyspace for messages (string value)
-#keyspace = conductor_rpc
-
-# Wait interval while checking for a message response. Default value is 1
-# second. (integer value)
-# Minimum value: 1
-#check_interval = 1
-
-# Overall message response timeout. Default value is 120 seconds. (integer
-# value)
-# Minimum value: 1
-#response_timeout = 120
-
-# Timeout for detecting a VM is down, and other VMs can pick the plan up.
-# Default value is 5 minutes. (integer value) (integer value)
-# Minimum value: 1
-#timeout = 300
-
-# Number of workers for messaging service. Default value is 1. (integer value)
-# Minimum value: 1
-#workers = 1
-
-# Time between checking for new messages. Default value is 1. (integer value)
-# Minimum value: 1
-#polling_interval = 1
-
-# Log debug messages. Default value is False. (boolean value)
-#debug = false
-
-
-[multicloud]
-
-#
-# From conductor
-#
-
-# Base URL for Multicloud without a trailing slash. (string value)
-server_url = http://msb.onap.org:8082/api/multicloud
-
-# Timeout for Multicloud Rest Call (string value)
-#multicloud_rest_timeout = 30
-
-# Number of retry for Multicloud Rest Call (string value)
-#multicloud_retries = 3
-
-# The version of Multicloud API. (string value)
-#server_url_version = v0
-
-# Certificate Authority Bundle file in pem format. Must contain the appropriate
-# trust chain for the Certificate file. (string value)
-#certificate_authority_bundle_file = certificate_authority_bundle.pem
-certificate_authority_bundle_file = /usr/local/bin/AAF_RootCA.cer
-
-# Enabling HTTPs mode (boolean value)
-# enable_https_mode = <None>
-enable_https_mode = True
-[music_api]
-
-#
-# From conductor
-#
-
-# Base URL for Music REST API without a trailing slash. (string value)
-server_url = http://localhost:8080/MUSIC/rest/v2
-version = v2
-
-# DEPRECATED: List of hostnames (round-robin access) (list value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Use server_url instead
-#hostnames = <None>
-
-# DEPRECATED: Port (integer value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Use server_url instead
-#port = <None>
-
-# DEPRECATED: Path (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Use server_url instead
-#path = <None>
-
-# Socket connection timeout (floating point value)
-#connect_timeout = 3.05
-
-# Socket read timeout (floating point value)
-#read_timeout = 12.05
-
-# Lock timeout (integer value)
-#lock_timeout = 10
-
-# Replication factor (integer value)
-#replication_factor = 1
-
-# Use mock API (boolean value)
-#mock = false
-
-# (string value)
-#music_topology = SimpleStrategy
-
-# Name of the first data center (string value)
-#first_datacenter_name = <None>
-
-# Number of replicas in first data center (integer value)
-#first_datacenter_replicas = <None>
-
-# Name of the second data center (string value)
-#second_datacenter_name = <None>
-
-# Number of replicas in second data center (integer value)
-#second_datacenter_replicas = <None>
-
-# Name of the third data center (string value)
-#third_datacenter_name = <None>
-
-# Number of replicas in third data center (integer value)
-#third_datacenter_replicas = <None>
-
-# new or old version (boolean value)
-#music_new_version = <None>
-music_new_version = True
-
-# for version (string value)
-#music_version = <None>
-music_version = "3.0.21"
-
-[prometheus]
-
-#
-# From conductor
-#
-
-# Prometheus Metrics Endpoint (list value)
-#metrics_port = 8000,8001,8002,8003,8004
-
-
-[reservation]
-
-#
-# From conductor
-#
-
-# Number of workers for reservation service. Default value is 1. (integer
-# value)
-# Minimum value: 1
-#workers = 1
-
-# Number of times reservation/release should be attempted. (integer value)
-#reserve_retries = 1
-
-# Timeout for detecting a VM is down, and other VMs can pick the plan up and
-# resereve. Default value is 600 seconds. (integer value) (integer value)
-# Minimum value: 1
-#timeout = 600
-
-# Set to True when reservation will run in active-active mode. When set to
-# False, reservation will restart any orphaned reserving requests at startup.
-# (boolean value)
-#concurrent = false
-concurrent = true
-
-# (integer value)
-# Minimum value: 1
-#max_reservation_counter = 1
-
-
-[sdnc]
-
-#
-# From conductor
-#
-
-# Interval with which to refresh the local cache, in minutes. (integer value)
-#cache_refresh_interval = 1440
-
-# Data Store table prefix. (string value)
-#table_prefix = sdnc
-
-# Base URL for SDN-C, up to and including the version. (string value)
-#server_url = https://controller:8443/restconf/
-server_url = http://localhost:8083/restconf/
-
-# Timeout for SDNC Rest Call (string value)
-#sdnc_rest_timeout = 30
-
-# Retry Numbers for SDNC Rest Call (string value)
-#sdnc_retries = 3
-
-
-[service_controller]
-
-#
-# From conductor
-#
-
-# Extensions list to use (list value)
-#extensions = sdnc
-
-
-[solver]
-
-#
-# From conductor
-#
-
-# Number of workers for solver service. Default value is 1. (integer value)
-# Minimum value: 1
-#workers = 1
-
-# The timeout value for solver service. Default value is 480 seconds. (integer
-# value)
-# Minimum value: 1
-#solver_timeout = 480
-
-# Set to True when solver will run in active-active mode. When set to False,
-# solver will restart any orphaned solving requests at startup. (boolean value)
-#concurrent = false
-concurrent = true
-
-# Timeout for detecting a VM is down, and other VMs can pick the plan up. This
-# value should be larger than solver_timeoutDefault value is 10 minutes.
-# (integer value) (integer value)
-# Minimum value: 1
-#timeout = 600
-
-# (integer value)
-# Minimum value: 1
-#max_solver_counter = 1
-
-
-[vim_controller]
-
-#
-# From conductor
-#
-
-# Extensions list to use (list value)
-#extensions = multicloud
-
-
-[sdc]
-
-#
-# From conductor
-#
-
-
-# Data Store table prefix. (string value)
-#table_prefix = sdc
-
-# Base URL for SDC, up to and not including the version, and without a
-# trailing slash. (string value)
-#server_url = https://controller:8443/sdc
-server_url = http://localhost:9595/sdc
-
-# Timeout for SDC Rest Call (string value)
-#sdc_rest_timeout = 30
-
-# Number of retry for SDC Rest Call (string value)
-#sdc_retries = 3
-
-# The version of A&AI in v# format. (string value)
-server_url_version = v1
-
-# SSL/TLS certificate file in pem format. This certificate must be registered
-# with the SDC endpoint. (string value)
-#certificate_file = certificate.pem
-certificate_file =
-
-# Private Certificate Key file in pem format. (string value)
-#certificate_key_file = certificate_key.pem
-certificate_key_file =
-
-# Certificate Authority Bundle file in pem format. Must contain the appropriate
-# trust chain for the Certificate file. (string value)
-#certificate_authority_bundle_file = certificate_authority_bundle.pem
-certificate_authority_bundle_file = /usr/local/bin/AAF_RootCA.cer
-
-# Username for SDC. (string value)
-#username =
-
-# Password for SDC. (string value)
-#password =
-
-temp_path = "/tmp/nsttemplates"
-
diff --git a/scripts/optf-has/has/has-properties/has.json b/scripts/optf-has/has/has-properties/has.json
deleted file mode 100644 (file)
index 4f48771..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "domain": {
-        "name": "has",
-        "secrets": [
-            {
-                "name": "aai",
-                "values": {
-                    "username": "oof@oof.onap.org",
-                    "password": "demo123456!"
-                }
-            },
-            {
-                "name": "conductor_api",
-                "values": {
-                    "username": "admin1",
-                    "password": "plan.15"
-                }
-            },
-            {
-                "name": "sdnc",
-                "values": {
-                    "username": "admin",
-                    "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
-                }
-            },
-            {
-                "name": "music_api",
-                "values": {
-                    "aafuser": "conductor",
-                    "aafpass": "c0nduct0r",
-                    "aafns": "conductor"
-                }
-            },
-            {
-                "name": "aaf_api",
-                "values": {
-                    "username": "aaf_admin@people.osaaf.org",
-                    "password": "demo123456!",
-                    "aaf_conductor_user": "oof@oof.onap.org"
-                }
-            }
-        ]
-    }
-}
diff --git a/scripts/optf-has/has/has-properties/log.conf.onap b/scripts/optf-has/has/has-properties/log.conf.onap
deleted file mode 100644 (file)
index 41d6644..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-[loggers]
-keys=root
-
-[handlers]
-keys=trfhand,consoleHandler,audithand,metrichand,errhand,debughand
-
-[logger_root]
-level=NOTSET
-handlers=trfhand,consoleHandler,audithand,metrichand,errhand,debughand
-
-[handler_consoleHandler]
-class=StreamHandler
-level=NOTSET
-formatter=generic
-args=(sys.stdout,)
-
-[handler_trfhand]
-class=handlers.TimedRotatingFileHandler
-level=NOTSET
-formatter=generic
-args=('application.log','midnight', 1, 10)
-
-[handler_audithand]
-class=handlers.TimedRotatingFileHandler
-level=INFO
-formatter=audit
-args=('audit.log', 'midnight', 1, 10)
-
-[handler_metrichand]
-class=handlers.TimedRotatingFileHandler
-level=INFO
-formatter=metric
-args=('metric.log','midnight', 1, 10)
-
-[handler_errhand]
-class=handlers.TimedRotatingFileHandler
-level=ERROR
-formatter=error
-args=('error.log','midnight', 1, 10)
-
-[handler_debughand]
-class=handlers.TimedRotatingFileHandler
-level=DEBUG
-formatter=generic
-args=('debug.log','midnight', 1, 10)
-
-[formatters]
-keys=generic,audit,metric,error
-
-[formatter_audit]
-format=%(asctime)s|%(asctime)s|00000000-0000-0000-0000-000000000000||%(thread)d||Conductor|N/A|COMPLETE|200|sucessful||%(levelname)s|||0|%(module)s|||||||||%(name)s : [-] %(message)s
-datefmt=
-
-[formatter_metric]
-format=%(asctime)s|%(asctime)s|00000000-0000-0000-0000-000000000000||%(thread)d||Conductor|N/A|N/A|N/A|COMPLETE|200|sucessful||%(levelname)s|||0|%(module)s||||||||||%(name)s : [-] %(message)s
-datefmt=
-
-[formatter_error]
-format=%(asctime)s|00000000-0000-0000-0000-000000000000|%(thread)d|Conductor|N/A|N/A|N/A|ERROR|500|N/A|%(name)s : [-] %(message)s
-datefmt=
-
-[formatter_generic]
-format=%(asctime)s||%(thread)d|%(levelname)s|%(module)s|%(name)s: [-] %(message)s
-datefmt=
-
diff --git a/scripts/optf-has/has/has_proxy_settings.sh b/scripts/optf-has/has/has_proxy_settings.sh
deleted file mode 100755 (executable)
index 4809610..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# put into this file local proxy settings in case they are needed on your local environment
-echo "### This is ${WORKSPACE}/scripts/optf-has/has/has_proxy_settings.sh"
-
-echo "optf/has proxy settings"
-if [ "$#" -eq  "1" ]; then
-     echo "$1"
-     cd $1
-     pwd
-else
-     exit 1
-fi
-
-# don't remove following lines: commands can be attached here
-
-
diff --git a/scripts/optf-has/has/has_script.sh b/scripts/optf-has/has/has_script.sh
deleted file mode 100755 (executable)
index b845dda..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "### This is ${WORKSPACE}/scripts/optf-has/has/has_script.sh"
-#
-# add here whatever commands is needed to prepare the optf/has CSIT testing
-#
-
-# assume the base is /tmp dir
-DIR=/tmp
-
-# the directory of the script
-echo ${DIR}
-cd ${DIR}
-
-# create directory for volume and copy configuration file
-# run docker containers
-COND_CONF=/tmp/conductor/properties/conductor.conf
-LOG_CONF=/tmp/conductor/properties/log.conf
-IMAGE_NAME=nexus3.onap.org:10001/onap/optf-has
-IMAGE_VER=2.1.3-SNAPSHOT-latest
-BUNDLE=/tmp/conductor/properties/AAF_RootCA.cer
-
-mkdir -p /tmp/conductor/properties
-mkdir -p /tmp/sms/properties
-mkdir -p /tmp/conductor/logs
-cp ${WORKSPACE}/scripts/optf-has/has/has-properties/conductor.conf.onap /tmp/conductor/properties/conductor.conf
-cp ${WORKSPACE}/scripts/optf-has/has/has-properties/log.conf.onap /tmp/conductor/properties/log.conf
-cp ${WORKSPACE}/scripts/optf-has/has/has-properties/AAF_RootCA.cer /tmp/conductor/properties/AAF_RootCA.cer
-cp ${WORKSPACE}/scripts/optf-has/has/has-properties/has.json /tmp/sms/properties/has.json
-#chmod -R 777 /tmp/conductor/properties
-
-MUSIC_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
-echo "MUSIC_IP=${MUSIC_IP}"
-SMS_IP=`get-instance-ip.sh sms`
-echo "SMS_IP=${SMS_IP}"
-
-# change MUSIC reference to the local instance
-sed  -i -e "s%localhost:8080/MUSIC%${MUSIC_IP}:8080/MUSIC%g" /tmp/conductor/properties/conductor.conf
-
-AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim`
-echo "AAISIM_IP=${AAISIM_IP}"
-
-# change AAI reference to the local instance
-sed  -i -e "s%localhost:8081/%${AAISIM_IP}:8081/%g" /tmp/conductor/properties/conductor.conf
-
-SDCSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' sdcsim`
-echo "SDCSIM_IP=${SDCSIM_IP}"
-
-# change SDC reference to the local instance
-sed  -i -e "s%localhost:9595/%${SDCSIM_IP}:9595/%g" /tmp/conductor/properties/conductor.conf
-
-
-MULTICLOUDSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' multicloudsim`
-echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
-
-# change MULTICLOUD reference to the local instance
-sed  -i -e "s%msb.onap.org:8082/%${MULTICLOUDSIM_IP}:8082/%g" /tmp/conductor/properties/conductor.conf
-
-AAFSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aafsim`
-echo "AAFSIM_IP=${AAFSIM_IP}"
-
-# change AAF reference to the local instance
-sed  -i -e "s%localhost:8100/%${AAFSIM_IP}:8100/%g" /tmp/conductor/properties/conductor.conf
-
-#SMS
-sed  -i -e "s%aaf-sms.onap:10443%${SMS_IP}:10443%g" /tmp/conductor/properties/conductor.conf
-#Preload secrets
-docker exec --user root -i sms /bin/sh -c "mkdir -p /preload/config"
-docker cp /tmp/sms/properties/has.json sms:/preload/config/has.json
-docker exec --user root -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost"
-docker logs vault
-
-#onboard conductor into music
-echo "Query MUSIC to check for reachability. Query Version"
-curl -vvvvv --noproxy "*" --request GET http://${MUSIC_IP}:8080/MUSIC/rest/v2/version -H "Content-Type: application/json"
-
-echo "Onboard conductor into music"
-curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" -H "Authorization: Basic Y29uZHVjdG9yOmMwbmR1Y3Qwcg==" --data @${WORKSPACE}/tests/optf-has/has/data/onboard.json
-
-docker run -d --name cond-cont --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
-sleep 15
-docker run -d --name cond-api --user root -p "8091:8091" -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf
-sleep 15
-docker run -d --name cond-solv --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf
-sleep 15
-docker run -d --name cond-resv --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
-sleep 5
-docker run -d --name cond-data --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
-sleep 15
-
-COND_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' cond-api`
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${COND_IP} 8091
-
-echo "inspect docker things for tracing purpose"
-docker inspect cond-data
-docker inspect cond-cont
-docker inspect cond-api
-docker inspect cond-solv
-docker inspect cond-resv
-
-echo "dump music content just after conductor is started"
-docker exec music-db /usr/bin/nodetool status
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
diff --git a/scripts/optf-has/has/has_teardown_script.sh b/scripts/optf-has/has/has_teardown_script.sh
deleted file mode 100755 (executable)
index bef28b4..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "print meaningful data before scratching everything"
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM conductor.plans'
-
-echo "optf/has scripts docker containers killing";
-docker stop cond-api
-docker stop cond-solv
-docker stop cond-cont
-docker stop cond-data
-docker stop cond-resv
-
-docker rm cond-api
-docker rm cond-solv
-docker rm cond-cont
-docker rm cond-data
-docker rm cond-resv
-
diff --git a/scripts/optf-has/has/music-properties/log4j.properties b/scripts/optf-has/has/music-properties/log4j.properties
deleted file mode 100644 (file)
index 1312e9b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# No longer needed, please see the logback properties
-
-
diff --git a/scripts/optf-has/has/music-properties/music.properties b/scripts/optf-has/has/music-properties/music.properties
deleted file mode 100644 (file)
index 02fb52d..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-my.public.ip=localhost
-all.public.ips=localhost
-my.id=0
-all.ids=0
-#######################################
-# Optional current values are defaults
-#######################################
-zookeeper.host=music-zk
-cassandra.host=music-db
-#music.ip=localhost
-#debug=true
-#music.rest.ip=localhost
-#lock.lease.period=6000
-cassandra.user=nelson24
-cassandra.password=winman123
-
-
diff --git a/scripts/optf-has/has/music_script.sh b/scripts/optf-has/has/music_script.sh
deleted file mode 100755 (executable)
index 4257dad..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "### This is ${WORKSPACE}/scripts/optf-has/has/music_script.sh"
-#
-# add here whatever commands is needed to prepare the music setup for optf-has CSIT testing
-#
-
-#
-# add here all the configuration steps eventually needed to be carried out for music CSIT testing
-#
-echo "########## music configuration step ##########";
-CASS_IMG=nexus3.onap.org:10001/onap/music/cassandra_3_11:3.0.23
-CASS_IMG_JOB=nexus3.onap.org:10001/onap/music/cassandra_job:3.0.23
-TOMCAT_IMG=nexus3.onap.org:10001/library/tomcat:8.5
-ZK_IMG=nexus3.onap.org:10001/library/zookeeper:3.4
-BUSYBOX_IMG=nexus3.onap.org:10001/library/busybox:latest
-MUSIC_IMG=nexus3.onap.org:10001/onap/music/music:3.0.23
-TT=10
-WORK_DIR=/tmp/music
-CASS_USERNAME=nelson24
-CASS_PASSWORD=winman123
-MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/scripts/optf-has/has/music-properties
-MUSIC_PROPERTIES=/tmp/music/properties
-MUSIC_LOGS=/tmp/music/logs
-CQL_FILES=${WORKSPACE}/scripts/music/cql
-MUSIC_TRIGGER_DIR=/tmp/triggers
-TRIGGER_JAR=musictrigger-0.1.0.jar
-TRIGGER_JAR_URL=https://nexus.onap.org/service/local/repositories/autorelease-72298/content/org/onap/music/musictrigger/0.1.0/musictrigger-0.1.0.jar
-
-mkdir -p ${MUSIC_PROPERTIES}
-mkdir -p ${MUSIC_LOGS}
-mkdir -p ${MUSIC_LOGS}/MUSIC
-mkdir -p /tmp/triggers
-
-# Get Trigger
-echo "########## Get Trigger Jar ##########"
-curl -o $MUSIC_TRIGGER_DIR/$TRIGGER_JAR $TRIGGER_JAR_URL
-
-cp ${MUSIC_SOURCE_PROPERTIES}/* ${WORK_DIR}/properties
-
-# Create Volume for mapping war file and tomcat
-echo "########## create music-vol ##########"
-docker volume create --name music-vol;
-
-# Create a network for all the containers to run in.
-echo "########## create music-net ##########"
-docker network create music-net;
-
-# Start Cassandra
-echo "########## Start Cassandra (music-db) ##########"
-docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001" -p "7199:7199" -p "9042:9042" -p "9160:9160" \
--v $MUSIC_TRIGGER_DIR/$TRIGGER_JAR:/etc/cassandra/triggers/$TRIGGER_JAR \
-${CASS_IMG};
-
-# See if cassandra is up.
-echo "########## Running Test to see if Cassandra is up ##########"
-CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db`
-echo "CASSANDRA_IP=${CASSA_IP}"
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
-
-# Sleep 60 seconds to ensure Cassandra is up and running.
-sleep 60;
-
-# Check to see if Keyspaces are there.
-docker exec music-db cqlsh -u cassandra -p cassandra -e "DESCRIBE keyspaces;"
-
-# Load data into Cassandra via Cassandra Job
-echo "########## Running Cassandra Job (music-job) to load cql files ##########"
-docker run -d --name music-job --network music-net \
--v $CQL_FILES/admin.cql:/cql/admin.cql \
--v $CQL_FILES/admin_pw.cql:/cql/admin_pw.cql \
--v $CQL_FILES/extra:/cql/extra \
--e PORT=9042 \
--e CASS_HOSTNAME=music-db \
--e USERNAME=$CASS_USERNAME \
--e PASSWORD=$CASS_PASSWORD \
-$CASS_IMG_JOB
-
-sleep 70;
-
-# Logs
-echo "########## Cassandra Job logs ##########"
-docker logs music-job
-# Check to see if Keyspaces are there.
-# "############## Check if new username and password work ##########"
-docker exec music-db cqlsh -u $CASS_USERNAME -p $CASS_PASSWORD -e "DESCRIBE keyspaces;"
-# Check to see if Keyspaces are there.
-# "############## Check if original username and password work ##########"
-docker exec music-db cqlsh -u cassandra -p cassandra -e "DESCRIBE keyspaces;"
-# Check to see if Keyspaces are there.
-# "############## Check if new cassandra username and password work ##########"
-docker exec music-db cqlsh -u cassandra -p SomeLongRandomStringNoonewillthinkof -e "DESCRIBE keyspaces;"
-
-
-# Start Music war
-echo "########## Start music-war ##########"
-docker run -d --name music-war -v music-vol:/app ${MUSIC_IMG};
-
-# Start Zookeeper
-echo "########## Start zookeeper (music-zk) ##########"
-docker run -d --name music-zk --network music-net -p "2181:2181" -p "2888:2888" -p "3888:3888" ${ZK_IMG};
-
-ZOO_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-zk`
-echo "ZOOKEEPER_IP=${ZOO_IP}"
-
-# Delay  between Cassandra/Zookeeper and Tomcat
-sleep 120;
-
-# Start Up tomcat - Needs to have properties,logs dir and war file volume mapped.
-echo "########## Start Tomcat (music-tomcat) ##########"
-docker run -d --name music-tomcat --network music-net -p "8080:8080" -v music-vol:/usr/local/tomcat/webapps -v ${WORK_DIR}/properties:/opt/app/music/etc:ro -v ${WORK_DIR}/logs:/opt/app/music/logs ${TOMCAT_IMG};
-
-# Connect tomcat to host bridge network so that its port can be seen.
-echo "########## Create Bridge for Tomcat ##########"
-docker network connect bridge music-tomcat;
-
-TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
-echo "TOMCAT_IP=${TOMCAT_IP}"
-
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${TOMCAT_IP} 8080
-
-sleep 20;
-echo "########## TOMCAT Logs ##########"
-docker logs music-tomcat
-# Needed only if we need to look at localhost logs.
-echo "########## MUSIC localhost Log ##########"
-docker exec music-tomcat /bin/bash -c "cat /usr/local/tomcat/logs/localhost*"
-
-echo "########## MUSIC Log ##########"
-ls -al $MUSIC_LOGS/MUSIC
-docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/music.log"
-#echo "########## MUSIC error log ##########"
-#docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/error.log"
-
-echo "########## inspect docker things for tracing purpose ##########"
-docker inspect music-db
-docker inspect music-zk
-docker inspect music-tomcat
-docker inspect music-war
-docker volume inspect music-vol
-docker network inspect music-net
-
-echo "########## dump music content just after music is started ##########"
-docker exec music-db /usr/bin/nodetool status
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'DESCRIBE keyspace admin'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
-
-
-#
-# add here all ROBOT_VARIABLES settings
-#
-echo "########## music robot variables settings ##########";
-ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://${TOMCAT_IP} -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091"
-
-echo ${ROBOT_VARIABLES}
-
-
-
diff --git a/scripts/optf-has/has/music_teardown_script.sh b/scripts/optf-has/has/music_teardown_script.sh
deleted file mode 100755 (executable)
index 2e7d707..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-#
-# add here below the killing of all docker containers used for music CSIT testing
-#
-echo "dump music.log files"
-ls -alF /tmp/music
-ls -alFR /tmp/music
-ls -alF /tmp/music/properties
-cat /tmp/music/properties/music.properties
-echo "===== MUSIC log =================="
-docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/music.log"
-#cat /tmp/music/logs/MUSIC/music.log
-echo "===== MUSIC error log =================="
-docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/error.log"
-#cat /tmp/music/logs/MUSIC/error.log
-
-echo "##########################################################";
-echo "#";
-echo "# music scripts docker containers killing";
-echo "#";
-echo "##########################################################";
-docker stop music-tomcat
-docker stop music-war
-docker stop music-zk
-docker stop music-job
-docker stop music-db
-
-docker rm music-zk
-docker rm music-tomcat
-docker rm music-war
-docker rm music-job
-docker rm music-db
-
-docker network rm music-net;
-sleep 5;
-
-docker volume rm music-vol
-
-#rm -Rf /tmp/music
-
-
-
-
-
diff --git a/scripts/optf-has/has/setup-sms.sh b/scripts/optf-has/has/setup-sms.sh
deleted file mode 100755 (executable)
index e6a4b22..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Not sure why this is needed.
-source ${SCRIPTS}/common_functions.sh
-
-CONFIG_FILE=$(pwd)/config/smsconfig.json
-
-mkdir -p $(pwd)/config
-
-docker login -u docker -p docker nexus3.onap.org:10001
-docker pull nexus3.onap.org:10001/onap/aaf/sms
-docker pull docker.io/vault:1.3.3
-
-#
-# Running vault in dev server mode here for CSIT
-# In HELM it runs in production mode
-#
-docker run -e "VAULT_DEV_ROOT_TOKEN_ID=aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee" \
-           -e SKIP_SETCAP=true \
-           --name vault -d -p 8200:8200 vault:1.3.3
-
-SMSDB_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vault)
-cat << EOF > $CONFIG_FILE
-{
-    "cafile": "auth/selfsignedca.pem",
-    "servercert": "auth/server.cert",
-    "serverkey":  "auth/server.key",
-
-    "smsdbaddress":     "http://$SMSDB_IP:8200",
-    "vaulttoken":       "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-    "disable_tls": true
-}
-EOF
-
-cat $CONFIG_FILE
-
-docker run --workdir /sms -v $CONFIG_FILE:/sms/smsconfig.json \
-           --name sms -d -p 10443:10443 --user root nexus3.onap.org:10001/onap/aaf/sms
-
-SMS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sms)
-
-echo "###### WAITING FOR ALL CONTAINERS TO COME UP"
-sleep 20
-for i in {1..20}; do
-    curl -sS -m 1 http://${SMSDB_IP}:8200/v1/sys/seal-status && break
-    echo sleep $i
-    sleep $i
-done
-
-#
-# add here all ROBOT_VARIABLES settings
-#
-echo "# sms robot variables settings";
-ROBOT_VARIABLES="-v SMS_HOSTNAME:http://${SMS_IP} -v SMS_PORT:10443"
-
-echo ${ROBOT_VARIABLES}
diff --git a/scripts/optf-has/has/simulator_script.sh b/scripts/optf-has/has/simulator_script.sh
deleted file mode 100755 (executable)
index a3e4faa..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "### This is ${WORKSPACE}/scripts/optf-has/has/simulator_script.sh"
-#
-# add here whatever commands is needed to prepare the optf/has CSIT testing
-#
-
-# assume the base is /tmp dir
-DIR=/tmp
-
-# the directory of the script
-echo ${DIR}
-cd ${DIR}
-
-# the temp directory used, within $DIR
-# omit the -p parameter to create a temporal directory in the default location
-WORK_DIR=`mktemp -d -p "$DIR"`
-echo ${WORK_DIR}
-cd ${WORK_DIR}
-
-# clone optf-has project
-git clone https://gerrit.onap.org/r/optf/has
-
-#echo "i am ${USER} : only non jenkins users may need proxy settings"
-if [ ${USER} != 'jenkins' ]; then
-
-    # add proxy settings into this script when you work behind a proxy
-    ${WORKSPACE}/scripts/optf-has/has/has_proxy_settings.sh ${WORK_DIR}
-
-fi
-
-# prepare aaisim
-cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/
-
-# run aaisim
-./run_aaisim.sh
-
-AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim`
-echo "AAISIM_IP=${AAISIM_IP}"
-
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${AAISIM_IP} 8081
-
-# prepare multicloudsim
-cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/multicloudsim/
-
-# check Dockerfile content
-cat ./Dockerfile
-
-# build multicloudsim
-docker build -t multicloudsim .
-
-# run multicloudsim
-docker run -d --name multicloudsim -p 8082:8082  multicloudsim
-
-MULTICLOUDSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' multicloudsim`
-echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
-
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${MULTICLOUDSIM_IP} 8082
-
-
-# prepare sdcsim
-cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/sdcsim/
-
-# check Dockerfile content
-cat ./Dockerfile
-
-# build multicloudsim
-docker build -t sdcsim .
-
-# run multicloudsim
-docker run -d --name sdcsim -p 9595:9595  sdcsim
-
-SDCSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' sdcsim`
-echo "SDCSIM_IP=${SDCSIM_IP}"
-
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${SDCSIM_IP} 9595
-
-
-# prepare aafsim
-echo "simulator_script: prepare aafsim "
-cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/aafsim/
-
-# check Dockerfile content
-echo "simulator_script: Dockerfile "
-cat ./Dockerfile
-
-# build aafsim
-echo "simulator_script: build docker "
-docker build -t aafsim .
-
-# run aafsim
-echo "simulator_script: run docker "
-docker run -d --name aafsim -p 8100:8100 aafsim
-
-AAFSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aafsim`
-echo "simulator_script: AAFSIM_IP=${AAFSIM_IP}"
-
-#echo "simulator_script: wait_for_port"
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${AAFSIM_IP} 8100
-
-# wait a while before continuing
-sleep 2
-
-echo "inspect docker things for tracing purpose"
-docker inspect aaisim
-docker inspect multicloudsim
-docker inspect aafsim
diff --git a/scripts/optf-has/has/simulator_teardown_script.sh b/scripts/optf-has/has/simulator_teardown_script.sh
deleted file mode 100755 (executable)
index 14b3886..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "optf/has scripts docker containers killing";
-docker stop aaisim
-docker stop multicloudsim
-docker stop aafsim
-docker stop sdcsim
-
-docker rm aaisim
-docker rm multicloudsim
-docker rm aafsim
-docker rm sdcsim
\ No newline at end of file
diff --git a/scripts/optf-has/has/wait_for_port.sh b/scripts/optf-has/has/wait_for_port.sh
deleted file mode 100755 (executable)
index 10f08de..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-if [[ $# -ne 2 ]]; then
-       echo "Usage: wait-for-port hostname port" >&2
-       exit 1
-fi
-
-host=$1
-port=$2
-
-echo "Waiting for $host port $port open"
-until telnet $host $port </dev/null 2>/dev/null | grep -q '^Connected'; do
-       sleep 1
-done
-
-echo "$host port $port is open"
-
-exit 0
diff --git a/scripts/optf-osdf/osdf/osdf-properties/aaf_root_ca.cer b/scripts/optf-osdf/osdf/osdf-properties/aaf_root_ca.cer
deleted file mode 100644 (file)
index e9a50d7..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV
-BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx
-NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK
-DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7
-XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn
-H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM
-pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7
-NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg
-2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY
-wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd
-ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM
-P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6
-aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY
-PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G
-A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ
-UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN
-BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz
-L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9
-7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx
-c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf
-jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2
-RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h
-PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF
-CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+
-Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A
-cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR
-ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX
-dYY=
------END CERTIFICATE-----
diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf.json b/scripts/optf-osdf/osdf/osdf-properties/osdf.json
deleted file mode 100644 (file)
index ae059f3..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "domain": {
-        "name": "osdf",
-        "secrets": [
-            {
-                "name": "so",
-                "values": {
-                    "UserName": "",
-                    "Password": ""
-                }
-            },
-            {
-                "name": "conductor",
-                "values": {
-                    "UserName": "admin1",
-                    "Password": "plan.15"
-                }
-            },
-            {
-                "name": "policyPlatform",
-                "values": {
-                    "UserName": "testpdp",
-                    "Password": "alpha123"
-                }
-            },
-            {
-                "name": "policyClient",
-                "values": {
-                    "UserName": "python",
-                    "Password": "test"
-                }
-            },
-            {
-                "name": "dmaap",
-                "values": {
-                    "UserName": "NA",
-                    "Password": "NA"
-                }
-            },
-            {
-                "name": "sdc",
-                "values": {
-                    "UserName": "NA",
-                    "Password": "NA"
-                }
-            },
-            {
-                "name": "osdfPlacement",
-                "values": {
-                    "UserName": "test",
-                    "Password": "testpwd"
-                }
-            },
-            {
-                "name": "osdfPlacementSO",
-                "values": {
-                    "UserName": "so_test",
-                    "Password": "so_testpwd"
-                }
-            },
-            {
-                "name": "osdfPlacementVFC",
-                "values": {
-                    "UserName": "vfc_test",
-                    "Password": "vfc_testpwd"
-                }
-            },
-            {
-                "name": "osdfCMScheduler",
-                "values": {
-                    "UserName": "test1",
-                    "Password": "testpwd1"
-                }
-            },
-            {
-                "name": "configDb",
-                "values": {
-                    "UserName": "osdf",
-                    "Password": "passwd"
-                }
-            },
-            {
-                "name": "pciHMS",
-                "values": {
-                    "UserName": "",
-                    "Password": ""
-                }
-            },
-            {
-                "name": "osdfPCIOpt",
-                "values": {
-                    "UserName": "pci_test",
-                    "Password": "pci_testpwd"
-                }
-            },
-            {
-                "name": "osdfOptEngine",
-                "values": {
-                    "UserName": "opt_test",
-                    "Password": "opt_testpwd"
-                }
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml
deleted file mode 100755 (executable)
index 95856df..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-placementVersioningEnabled: False
-
-# Placement API latest version numbers to be set in HTTP header
-placementMajorVersion: "1"
-placementMinorVersion: "0"
-placementPatchVersion: "0"
-
-# Placement API default version numbers to be set in HTTP header
-placementDefaultMajorVersion: "1"
-placementDefaultMinorVersion: "0"
-placementDefaultPatchVersion: "0"
-
-# Config for Conductor
-conductorUrl: "http://127.0.0.1:5000/simulated/oof/has-api/flow1-success-simple/main.json"
-conductorPingWaitTime: 2  # seconds to wait before calling the conductor retry URL
-conductorMaxRetries: 5  # if we don't get something in 30 minutes, give up
-# versions to be set in HTTP header
-conductorMinorVersion: 0
-
-# Policy Platform -- requires ClientAuth, Authorization, and Environment
-policyPlatformUrl: http://127.0.0.1:5000/simulated/policy/pdpx/decision/v1 # Policy Dev platform URL
-policyPlatformEnv: TEST  # Environment for policy platform
-
-# Config for DMaaP
-messageReaderHosts: https://DMAAP-HOST1:3905,https://DMAAP-HOST2:3905,https://DMAAP-HOST3:3905
-messageReaderTopic: org.onap.oof.osdf.multicloud
-
-# Config for SDC
-sdcUrl: https://SDC-HOST:8443/sdc/v1/catalog
-sdcONAPInstanceID: ONAP-OSDF
-
-osdfPlacementUrl: "http://127.0.0.1:24699/osdf/api/v2/placement"
-
-is_aaf_enabled: False
-aaf_cache_expiry_hrs: 3
-aaf_url: https://aaftest.simpledemo.onap.org:8095
-aaf_user_roles:
-    - /api/oof/v1/placement:org.onap.osdf.access|*|read ALL
-
-# Secret Management Service from AAF
-aaf_sms_url: http://aaf-sms.onap:10443
-aaf_sms_timeout: 30
-secret_domain: osdf
-aaf_ca_certs: ssl_certs/aaf_root_ca.cer
-
-# config db api
-configDbUrl: http://127.0.0.1:5000/simulated/configdb
-configDbGetCellListUrl: 'getCellList'
-configDbGetNbrListUrl: 'getNbrList'
-
-#key
-appkey:
diff --git a/scripts/optf-osdf/osdf/osdf_proxy_settings.sh b/scripts/optf-osdf/osdf/osdf_proxy_settings.sh
deleted file mode 100755 (executable)
index b68fca9..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-# put into this file local proxy settings in case they are needed on your local environment
-echo "### This is ${WORKSPACE}/scripts/optf-osdf/osdf/osdf_proxy_settings.sh"
-
-echo "optf/osdf proxy settings"
-if [ "$#" -eq  "1" ]; then
-     echo "$1"
-     cd $1
-     pwd
-else
-     exit 1
-fi
-
-# don't remove following lines: commands can be attached here
-
-
diff --git a/scripts/optf-osdf/osdf/osdf_script.sh b/scripts/optf-osdf/osdf/osdf_script.sh
deleted file mode 100755 (executable)
index 2f2d0c9..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-echo "### This is ${WORKSPACE}/scripts/optf-osdf/osdf/osdf_script.sh"
-#
-# add here whatever commands is needed to prepare the optf/osdf CSIT testing
-#
-
-# assume the base is /tmp dir
-DIR=/tmp
-
-# the directory of the script
-echo ${DIR}
-cd ${DIR}
-
-# create directory for volume and copy configuration file
-# run docker containers
-OSDF_CONF=/tmp/osdf/properties/osdf_config.yaml
-IMAGE_NAME=nexus3.onap.org:10001/onap/optf-osdf
-IMAGE_VER=2.0.3-SNAPSHOT-latest
-
-mkdir -p /tmp/osdf/properties
-mkdir -p /tmp/sms/properties
-
-cp ${WORKSPACE}/scripts/optf-osdf/osdf/osdf-properties/*.yaml /tmp/osdf/properties/.
-cp ${WORKSPACE}/scripts/optf-osdf/osdf/osdf-properties/osdf.json /tmp/sms/properties/.
-
-#change conductor/configdb simulator urls
-OSDF_SIM_IP=`get-instance-ip.sh osdf_sim`
-echo "OSDF_SIM_IP=${OSDF_SIM_IP}"
-SMS_IP=`get-instance-ip.sh sms`
-echo "SMS_IP=${SMS_IP}"
-
-sed  -i -e "s%127.0.0.1:5000%${OSDF_SIM_IP}:5000%g" $OSDF_CONF
-sed  -i -e "s%aaf-sms.onap:10443%${SMS_IP}:10443%g" $OSDF_CONF
-
-#Preload secrets
-docker exec --user root -i sms  /bin/sh -c "mkdir -p /preload/config"
-docker cp /tmp/sms/properties/osdf.json sms:/preload/config/osdf.json
-docker exec --user root -i sms  /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost"
-
-docker logs vault
-docker run -d --name optf-osdf -v ${OSDF_CONF}:/opt/osdf/config/osdf_config.yaml -p "8698:8699" ${IMAGE_NAME}:${IMAGE_VER}
-
-sleep 20
-
-OSDF_IP=`get-instance-ip.sh optf-osdf`
-${WORKSPACE}/scripts/optf-osdf/osdf/wait_for_port.sh ${OSDF_IP} 8699
-
-echo "inspect docker things for tracing purpose"
-docker inspect optf-osdf
diff --git a/scripts/optf-osdf/osdf/setup-sms.sh b/scripts/optf-osdf/osdf/setup-sms.sh
deleted file mode 100755 (executable)
index e6a4b22..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Not sure why this is needed.
-source ${SCRIPTS}/common_functions.sh
-
-CONFIG_FILE=$(pwd)/config/smsconfig.json
-
-mkdir -p $(pwd)/config
-
-docker login -u docker -p docker nexus3.onap.org:10001
-docker pull nexus3.onap.org:10001/onap/aaf/sms
-docker pull docker.io/vault:1.3.3
-
-#
-# Running vault in dev server mode here for CSIT
-# In HELM it runs in production mode
-#
-docker run -e "VAULT_DEV_ROOT_TOKEN_ID=aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee" \
-           -e SKIP_SETCAP=true \
-           --name vault -d -p 8200:8200 vault:1.3.3
-
-SMSDB_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vault)
-cat << EOF > $CONFIG_FILE
-{
-    "cafile": "auth/selfsignedca.pem",
-    "servercert": "auth/server.cert",
-    "serverkey":  "auth/server.key",
-
-    "smsdbaddress":     "http://$SMSDB_IP:8200",
-    "vaulttoken":       "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-    "disable_tls": true
-}
-EOF
-
-cat $CONFIG_FILE
-
-docker run --workdir /sms -v $CONFIG_FILE:/sms/smsconfig.json \
-           --name sms -d -p 10443:10443 --user root nexus3.onap.org:10001/onap/aaf/sms
-
-SMS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sms)
-
-echo "###### WAITING FOR ALL CONTAINERS TO COME UP"
-sleep 20
-for i in {1..20}; do
-    curl -sS -m 1 http://${SMSDB_IP}:8200/v1/sys/seal-status && break
-    echo sleep $i
-    sleep $i
-done
-
-#
-# add here all ROBOT_VARIABLES settings
-#
-echo "# sms robot variables settings";
-ROBOT_VARIABLES="-v SMS_HOSTNAME:http://${SMS_IP} -v SMS_PORT:10443"
-
-echo ${ROBOT_VARIABLES}
diff --git a/scripts/optf-osdf/osdf/simulator_script.sh b/scripts/optf-osdf/osdf/simulator_script.sh
deleted file mode 100755 (executable)
index 8f3f7d3..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-echo "### This is ${WORKSPACE}/scripts/optf-osdf/osdf/simulator_script.sh"
-#
-# add here whatever commands is needed to prepare the optf/osdf CSIT testing
-#
-# assume the base is /tmp dir
-
-DIR=/tmp
-
-# the directory of the script
-echo ${DIR}
-cd ${DIR}
-
-# the temp directory used, within $DIR
-# omit the -p parameter to create a temporal directory in the default location
-WORK_DIR=`mktemp -d -p "$DIR"`
-echo ${WORK_DIR}
-cd ${WORK_DIR}
-
-# clone optf-osdf project
-git clone https://gerrit.onap.org/r/optf/osdf
-
-#echo "i am ${USER} : only non jenkins users may need proxy settings"
-if [ ${USER} != 'jenkins' ]; then
-
-    # add proxy settings into this script when you work behind a proxy
-    ${WORKSPACE}/scripts/optf-osdf/osdf/osdf_proxy_settings.sh ${WORK_DIR}
-
-fi
-
-# prepare osdf_sim
-cd ${WORK_DIR}/osdf/test/functest/simulators
-
-# check Dockerfile content
-cat ./Dockerfile
-
-# build osdf_sim
-chmod +x ./build_sim_image.sh
-./build_sim_image.sh
-
-# run osdf_sim
-docker run -d --name osdf_sim -p "5000:5000"  osdf_sim:latest;
-
-OSDF_SIM_IP=`get-instance-ip.sh osdf_sim`
-echo "OSDF_SIM_IP=${OSDF_SIM_IP}"
-
-${WORKSPACE}/scripts/optf-osdf/osdf/wait_for_port.sh ${OSDF_SIM_IP} 5000
-
-
-# wait a while before continuing
-sleep 2
-
-echo "inspect docker things for tracing purpose"
-docker inspect osdf_sim
-
diff --git a/scripts/optf-osdf/osdf/wait_for_port.sh b/scripts/optf-osdf/osdf/wait_for_port.sh
deleted file mode 100755 (executable)
index 360fc21..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-if [[ $# -ne 2 ]]; then
-       echo "Usage: wait-for-port hostname port" >&2
-       exit 1
-fi
-
-host=$1
-port=$2
-
-echo "Waiting for $host port $port open"
-until telnet $host $port </dev/null 2>/dev/null | grep -q '^Connected'; do
-       sleep 1
-done
-
-echo "$host port $port is open"
-
-exit 0
index 92b65cd..df47b86 100644 (file)
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # csit-dcaegen2-collectors-hv-ves
 # ================================================================================
-# Copyright (C) 2018-2019 NOKIA
+# Copyright (C) 2018-2021 NOKIA
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -39,9 +39,11 @@ Configure collector
 
 Configure Dcae App
     Wait until keyword succeeds   10 sec   5 sec
-    ...    Configure Dcae App Simulator To Consume Messages From Topics   ${DEFAULT_PERF3GPP_TOPIC},${SECOND_PERF3GPP_TOPIC}
+    ...    Configure Dcae App Simulator To Consume Messages From Topics
+    ...    ${DEFAULT_PERF3GPP_TOPIC},${SECOND_PERF3GPP_TOPIC},${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}
     Set Suite Variable   ${DEFAULT_PERF3GPP_TOPIC}   children=True
     Set Suite Variable   ${SECOND_PERF3GPP_TOPIC}    children=True
+    Set Suite Variable   ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}    children=True
 
 
 *** Variables ***
@@ -53,6 +55,7 @@ ${CONSUL_HV_VES_CONFIGURATION_KEY_PATH}        /v1/kv/dcae-hv-ves-collector
 
 ${DEFAULT_PERF3GPP_TOPIC}                      TEST_HV_VES_PERF3GPP
 ${SECOND_PERF3GPP_TOPIC}                       TEST_HV_VES_PERF3GPP_BUT_WITH_EXTRA_WORDS
+${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}    TEST_SEC_3GPP_HEARTBEAT_OUTPUT
 
 ${HV_VES_RESOURCES}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources
 ${HV_VES_CONFIGURATION_JSON_FILEPATH}          ${HV_VES_RESOURCES}/hv-ves-configuration.json
index 9898a96..c056604 100644 (file)
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # csit-dcaegen2-collectors-hv-ves
 # ================================================================================
-# Copyright (C) 2018-2019 NOKIA
+# Copyright (C) 2018-2021 NOKIA
 # Modification copyright (C) 2021 Samsung Electronics Co., Ltd.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,6 +46,15 @@ Correct Messages Routing
     ...    Assert Dcae App Consumed   ${DEFAULT_PERF3GPP_TOPIC}   ${AMOUNT_25000}
     Assert Dcae App Consumed Proper Messages   ${DEFAULT_PERF3GPP_TOPIC}   ${DCAE_FIXED_PAYLOAD_REQUEST}
 
+Correct StndDefined Messages Routing
+    [Documentation]   VES-HV Collector should route all valid messages to stndDefined topics specified in configuration
+    ...               without changing message payload generated in xNF simulator
+
+    Send Messages From xNF Simulators   ${XNF_SIMULATOR}    ${XNF_STNDDEFINED_PAYLOAD_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...    Assert Dcae App Consumed   ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}   ${AMOUNT_25000}
+    Assert Dcae App Consumed Proper Messages   ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}   ${DCAE_STNDDEFINED_PAYLOAD_REQUEST}
 
 Too big payload message handling
     [Documentation]   VES-HV Collector should interrupt the stream when a message with too big payload is encountered
@@ -86,6 +95,15 @@ Unsupported domain message handling
     ...    Assert Dcae App Consumed  ${DEFAULT_PERF3GPP_TOPIC}   ${AMOUNT_50000}
     Assert Dcae App Consumed Proper Messages   ${DEFAULT_PERF3GPP_TOPIC}   ${DCAE_UNSUPPORTED_DOMAIN_REQUEST}
 
+Unsupported stndDefinedNamespace message handling
+    [Documentation]   VES-HV Collector should skip messages with unsupported domain
+
+    Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_UNSUPPORTED_NAMESPACE_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...    Assert Dcae App Consumed  ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}   ${AMOUNT_50000}
+    Assert Dcae App Consumed Proper Messages   ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}   ${DCAE_UNSUPPORTED_NAMESPACE_REQUEST}
+
 *** Variables ***
 ${HTTP_METHOD_URL}                             http://
 
@@ -93,16 +111,20 @@ ${XNF_SIM_API_PATH}                            /simulator/async
 
 ${HV_VES_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
 ${XNF_FIXED_PAYLOAD_REQUEST}                   ${HV_VES_SCENARIOS}/fixed-payload/xnf-fixed-payload-request.json
+${XNF_STNDDEFINED_PAYLOAD_REQUEST}             ${HV_VES_SCENARIOS}/stnd-defined/valid/xnf-stnd-defined-payload-request.json
 ${XNF_TOO_BIG_PAYLOAD_REQUEST}                 ${HV_VES_SCENARIOS}/too-big-payload/xnf-too-big-payload-request.json
 ${XNF_INVALID_WIRE_FRAME_REQUEST}              ${HV_VES_SCENARIOS}/invalid-wire-frame/xnf-invalid-wire-frame-request.json
 ${XNF_INVALID_GPB_DATA_REQUEST}                ${HV_VES_SCENARIOS}/invalid-gpb-data/xnf-invalid-gpb-data-request.json
 ${XNF_UNSUPPORTED_DOMAIN_REQUEST}              ${HV_VES_SCENARIOS}/unsupported-domain/xnf-unsupported-domain-request.json
+${XNF_UNSUPPORTED_NAMESPACE_REQUEST}           ${HV_VES_SCENARIOS}/stnd-defined/unsupported-namespace/xnf-unsupported-namespace-request.json
 
 ${DCAE_FIXED_PAYLOAD_REQUEST}                  ${HV_VES_SCENARIOS}/fixed-payload/dcae-fixed-payload-request.json
+${DCAE_STNDDEFINED_PAYLOAD_REQUEST}            ${HV_VES_SCENARIOS}/stnd-defined/valid/dcae-stnd-defined-payload-request.json
 ${DCAE_TOO_BIG_PAYLOAD_REQUEST}                ${HV_VES_SCENARIOS}/too-big-payload/dcae-too-big-payload-request.json
 ${DCAE_INVALID_WIRE_FRAME_REQUEST}             ${HV_VES_SCENARIOS}/invalid-wire-frame/dcae-invalid-wire-frame-request.json
 ${DCAE_INVALID_GPB_DATA_REQUEST}               ${HV_VES_SCENARIOS}/invalid-gpb-data/dcae-invalid-gpb-data-request.json
 ${DCAE_UNSUPPORTED_DOMAIN_REQUEST}             ${HV_VES_SCENARIOS}/unsupported-domain/dcae-unsupported-domain-request.json
+${DCAE_UNSUPPORTED_NAMESPACE_REQUEST}          ${HV_VES_SCENARIOS}/stnd-defined/unsupported-namespace/dcae-unsupported-namespace-request.json
 
 ${AMOUNT_25000}                                25000
 ${AMOUNT_50000}                                50000
index bab8a90..b943935 100644 (file)
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # csit-dcaegen2-collectors-hv-ves
 # ================================================================================
-# Copyright (C) 2018-2019 NOKIA
+# Copyright (C) 2018-2021 NOKIA
 # Modification copyright (C) 2021 Samsung Electronics Co., Ltd.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -63,6 +63,7 @@ Send Messages From xNF Simulators
 VES-HV Collector Test Shutdown
     Reset DCAE App Simulator  ${DEFAULT_PERF3GPP_TOPIC}
     Reset DCAE App Simulator  ${SECOND_PERF3GPP_TOPIC}
+    Reset DCAE App Simulator  ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}
 
 
 VES-HV Collector Suite Teardown
index d932b7d..019e468 100644 (file)
         "bootstrap_servers": "kafka:9092",
         "topic_name": "TEST_HV_VES_PERF3GPP"
       }
+    },
+    "ves-3gpp-heartbeat": {
+      "type": "kafka",
+      "aaf_credentials": {
+        "username": "admin",
+        "password": "admin_secret"
+      },
+      "kafka_info": {
+        "bootstrap_servers": "kafka:9092",
+        "topic_name": "TEST_SEC_3GPP_HEARTBEAT_OUTPUT"
+      }
     }
   }
 }
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/dcae-unsupported-namespace-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/dcae-unsupported-namespace-request.json
new file mode 100644 (file)
index 0000000..1e75e48
--- /dev/null
@@ -0,0 +1,25 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 50000
+  }
+]
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/xnf-unsupported-namespace-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/unsupported-namespace/xnf-unsupported-namespace-request.json
new file mode 100644 (file)
index 0000000..02c0e84
--- /dev/null
@@ -0,0 +1,71 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-unknown-stream"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 100
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/dcae-stnd-defined-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/dcae-stnd-defined-payload-request.json
new file mode 100644 (file)
index 0000000..56371db
--- /dev/null
@@ -0,0 +1,25 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
\ No newline at end of file
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/xnf-stnd-defined-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/stnd-defined/valid/xnf-stnd-defined-payload-request.json
new file mode 100644 (file)
index 0000000..56371db
--- /dev/null
@@ -0,0 +1,25 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "stndDefined",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name",
+      "vesEventListenerVersion": "7.2.0",
+      "stndDefinedNamespace": "ves-3gpp-heartbeat"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
\ No newline at end of file
diff --git a/tests/integration/nfsimulator/netconf-server/assets/pnf-simulator-data.xml b/tests/integration/nfsimulator/netconf-server/assets/pnf-simulator-data.xml
new file mode 100644 (file)
index 0000000..ff4879e
--- /dev/null
@@ -0,0 +1,4 @@
+<config xmlns="http://onap.org/pnf-simulator">
+  <itemValue1>42</itemValue1>
+  <itemValue2>35</itemValue2>
+</config>
index 0d3ebde..21001e5 100644 (file)
@@ -1,17 +1,31 @@
 *** Settings ***
 Documentation     Run healthcheck
 Library              RequestsLibrary
+Library           Collections
 Resource          ./resources/netconf-server-keywords.robot
 
 
 *** Test Cases ***
 
-Netconf Server Rest API Health Check
+Netconf Server Healthy Check
     [Tags]      Netconf-Server
-    [Documentation]   Run healthcheck
-    Run Healthcheck
+    [Documentation]   Server Should be healthy
+    Verify That Server Is Healthy
 
-Netconf Server Rest API Readiness Check
+Netconf Server Readiness Check
     [Tags]      Netconf-Server
-    [Documentation]   Run readiness
-    Run Readiness 
\ No newline at end of file
+    [Documentation]   Server Should be ready
+    Verify That Server Is Ready
+
+Netconf Module Configuration Update
+    [Tags]      Netconf-Server
+    [Documentation]   Update Should Be Distributed
+    Update NetConf Module Configuration  pnf-simulator  ${PNF_SIMULATOR_DATA_XML}  202
+    Sleep   20s     Wait for message distribution in Kafka
+    Verify That Change Is Available In NetConf Module Change Configuration History  200
+
+Netconf Module Configuration History Get
+    [Tags]      Netconf-Server
+    [Documentation]   Configuration History should be returned
+    Update NetConf Module Configuration  pnf-simulator  ${PNF_SIMULATOR_DATA_XML}  202
+    Verify That Configuration History Is Available  200
\ No newline at end of file
index fd54487..43a02e6 100644 (file)
@@ -1,21 +1,49 @@
 *** Settings ***
-Library              RequestsLibrary
+Library           RequestsLibrary
+Resource          ../../../../common.robot
 Resource          ./netconf-server-properties.robot
 
 *** Keywords ***
 
-Run Healthcheck
-    [Documentation]  Run Healthcheck
+Verify That Server Is Healthy
+    [Documentation]  Verify that server is healthy
     Create Session    netconf_server_session    ${NETCONF_SERVER_URL}
     ${resp}=  GET On Session  netconf_server_session  /healthcheck
-    Should Be Equal As Strings         ${resp.status_code}  200
+    Should Be Equal As Strings  ${resp.status_code}  200
     Should Be Equal As Strings  ${resp.text}  UP
 
-Run Readiness 
-    [Documentation]  Run Readiness
+Verify That Server Is Ready
+    [Documentation]  Verify that server is ready
     Create Session    netconf_server_session    ${NETCONF_SERVER_URL}
-    ${resp}=  GET On Session  netconf_server_session  /readiness 
-    Should Be Equal As Strings         ${resp.status_code}  200
+    ${resp}=  GET On Session  netconf_server_session  /readiness
+    Should Be Equal As Strings  ${resp.status_code}  200
     Should Be Equal As Strings  ${resp.text}  Ready
 
+Update NetConf Module Configuration
+    [Documentation]  Update module configuration
+    [Arguments]   ${module}  ${path_to_data}  ${resp_code}
+    ${data}=  Get Data From File  ${path_to_data}
 
+    Create Session    netconf_server_session    ${NETCONF_SERVER_URL}
+    ${resp}=    POST On Session    netconf_server_session    /change_config/${module}   data=${data}
+    Should Be Equal As Strings    ${resp.status_code}    ${resp_code}
+
+Verify That Change Is Available In NetConf Module Change Configuration History
+    [Documentation]  Verify that configuration was distributed to Kafka
+    [Arguments]   ${resp_code}
+
+    Create Session    netconf_server_session    ${NETCONF_SERVER_URL}
+    ${resp}=    GET On Session    netconf_server_session    /change_history
+    Should Be Equal As Strings    ${resp.status_code}    ${resp_code}
+    ${actual_data}=  Convert To String  ${resp.json()}
+    Should Be Equal  ${actual_data}  [{u'new': {u'path': u'/pnf-simulator:config/itemValue1', u'value': 42}, u'type': u'ChangeCreated'}, {u'new': {u'path': u'/pnf-simulator:config/itemValue2', u'value': 35}, u'type': u'ChangeCreated'}]
+
+Verify That Configuration History Is Available
+    [Documentation]  Verify that configuration is available
+    [Arguments]   ${resp_code}
+
+    Create Session    netconf_server_session    ${NETCONF_SERVER_URL}
+    ${resp}=  GET On Session  netconf_server_session  /get_config/pnf-simulator
+    Should Be Equal As Strings    ${resp.status_code}    ${resp_code}
+    Dictionary Should Contain Item   ${resp.json()['config']}  itemValue1  ${42}
+    Dictionary Should Contain Item   ${resp.json()['config']}  itemValue2  ${35}
index 3903da7..c10fe24 100644 (file)
@@ -1,3 +1,4 @@
 *** Variables ***
 
 ${NETCONF_SERVER_URL}                           http://%{NETCONF_SERVER_IP}:%{NETCONF_SERVER_REST_PORT}
+${PNF_SIMULATOR_DATA_XML}                     %{WORKSPACE}/tests/integration/nfsimulator/netconf-server/assets/pnf-simulator-data.xml
diff --git a/tests/optf-has/has/__init__.robot b/tests/optf-has/has/__init__.robot
deleted file mode 100644 (file)
index fb654d7..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-*** Settings ***
-Documentation    Integration - Suite 1
-
-
diff --git a/tests/optf-has/has/data/healthcheck.json b/tests/optf-has/has/data/healthcheck.json
deleted file mode 100644 (file)
index 926bb28..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "consistencyInfo": {
-        "type": "eventual"
-    },
-    "values": {
-        "created": 1479482603641,
-        "message": "",
-        "name": "foo",
-        "recommend_max": 1,
-        "solution": "{\"healthcheck\": \" healthcheck\"}",
-        "status": "solved",
-        "template": "{\"healthcheck\": \"healthcheck\"}",
-        "timeout": 3600,
-        "translation": "{\"healthcheck\": \" healthcheck\"}",
-        "updated": 1484324150629
-    }
-}
-
-
diff --git a/tests/optf-has/has/data/nsi_selection_template_with_create.json b/tests/optf-has/has/data/nsi_selection_template_with_create.json
deleted file mode 100644 (file)
index acf53ff..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "files": {},
-    "limit": 10,
-    "name": "urllc_sample",
-    "num_solution": "1",
-    "template": {
-        "constraints": {
-            "URLLC_Threshold": {
-                "demands": [
-                    "URLLC"
-                ],
-                "properties": {
-                    "evaluate": [
-                        {
-                            "attribute": "latency",
-                            "operator": "lte",
-                            "threshold": {
-                                "get_param": "latency"
-                            },
-                            "unit": "ms"
-                        },
-                        {
-                            "attribute": "reliability",
-                            "operator": "gte",
-                            "threshold": {
-                                "get_param": "reliability"
-                            },
-                            "unit": ""
-                        }
-                    ]
-                },
-                "type": "threshold"
-            }
-        },
-        "demands": {
-            "URLLC": [
-                {
-                    "default_attributes": {
-                        "creation_cost": 0.1
-                    },
-                    "filtering_attributes": {
-                        "service-function": "shared",
-                        "model-invariant-id": "21d57d4b-52ad-4d3c-a798-248b5bb9124a",
-                        "model-version-id": "bfba363e-e39c-4bd9-a9d5-1371c28f4d22",
-                        "service-role": "nsi"
-                    },
-                    "inventory_provider": "aai",
-                    "inventory_type": "nsi",
-                    "unique": "true"
-                },
-                {
-                    "default_attributes": {
-                        "creation_cost": 0.9
-                    },
-                    "filtering_attributes": {
-                        "service_profile": {
-                                        "latency": {"value": {"get_param": "latency"}, "operator": "lte"},
-                                        "reliability": {"value": {"get_param": "reliability"}, "operator": "gte"}
-                                  },
-                        "subnets":{
-                        "core": {
-                            "latency": {
-                                "max": {
-                                    "get_param": "latency"
-                                },
-                                "min": {
-                                    "get_param": "core_latency"
-                                },
-                                "steps": 1
-                            },
-                            "reliability": {
-                                "values": [
-                                    {
-                                        "get_param": "core_reliability"
-                                    }
-                                ]
-                            }
-                        },
-                        "ran": {
-                            "latency": {
-                                "max": {
-                                    "get_param": "latency"
-                                },
-                                "min": {
-                                    "get_param": "ran_latency"
-                                },
-                                "steps": 1
-                            },
-                            "reliability": {
-                                "values": [
-                                    {
-                                        "get_param": "ran_reliability"
-                                    }
-                                ]
-                            }
-                        },
-                        "transport": {
-                            "latency": {
-                                "max": {
-                                    "get_param": "latency"
-                                },
-                                "min": {
-                                    "get_param": "tn_latency"
-                                },
-                                "steps": 1
-                            },
-                            "reliability": {
-                                "values": [
-                                    {
-                                        "get_param": "tn_reliability"
-                                    }
-                                ]
-                            }
-                        }
-                        }
-                    },
-                    "inventory_provider": "generator",
-                    "inventory_type": "slice_profiles",
-                    "unique": "true"
-                }
-            ]
-        },
-        "homing_template_version": "2020-08-13",
-        "optimization": {
-            "goal": "maximize",
-            "operation_function": {
-                "operands": [
-                    {
-                        "function": "attribute",
-                        "params": {
-                            "attribute": "creation_cost",
-                            "demand": "URLLC"
-                        }
-                    }
-                ],
-                "operator": "sum"
-            }
-        },
-        "parameters": {
-            "core_latency": 10,
-            "core_reliability": 99.9,
-            "latency": 30,
-            "ran_latency": 7,
-            "ran_reliability": 99.9,
-            "reliability": 99.9,
-            "tn_latency": 10,
-            "tn_reliability": 99.9
-        }
-    },
-    "timeout": 1200
-}
diff --git a/tests/optf-has/has/data/nsi_selection_template_with_nonsi.json b/tests/optf-has/has/data/nsi_selection_template_with_nonsi.json
deleted file mode 100644 (file)
index b4e625a..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "files": {},
-    "limit": 10,
-    "name": "urllc_sample",
-    "num_solution": "1",
-    "template": {
-        "constraints": {
-            "URLLC_Threshold": {
-                "demands": [
-                    "URLLC"
-                ],
-                "properties": {
-                    "evaluate": [
-                        {
-                            "attribute": "latency",
-                            "operator": "lte",
-                            "threshold": {
-                                "get_param": "latency"
-                            },
-                            "unit": "ms"
-                        },
-                        {
-                            "attribute": "reliability",
-                            "operator": "gte",
-                            "threshold": {
-                                "get_param": "reliability"
-                            },
-                            "unit": ""
-                        }
-                    ]
-                },
-                "type": "threshold"
-            }
-        },
-        "demands": {
-            "URLLC": [
-                {
-                    "default_attributes": {
-                        "creation_cost": 0.1
-                    },
-                    "filtering_attributes": {
-                        "service-function": "shared",
-                        "model-invariant-id": "21d57d4b-52ad-4d3c-a798-248b5bb9124a",
-                        "model-version-id": "637762da-0764-43cc-8b9a-535085770821",
-                        "service-role": "nsi"
-                    },
-                    "inventory_provider": "aai",
-                    "inventory_type": "nsi",
-                    "unique": "true"
-                },
-                {
-                    "default_attributes": {
-                        "creation_cost": 0.9
-                    },
-                    "filtering_attributes": {
-                        "service_profile": {
-                                        "latency": {"value": {"get_param": "latency"}, "operator": "lte"},
-                                        "reliability": {"value": {"get_param": "reliability"}, "operator": "gte"}
-                                  },
-                        "subnets":{
-                        "core": {
-                            "latency": {
-                                "max": {
-                                    "get_param": "latency"
-                                },
-                                "min": {
-                                    "get_param": "core_latency"
-                                },
-                                "steps": 1
-                            },
-                            "reliability": {
-                                "values": [
-                                    {
-                                        "get_param": "core_reliability"
-                                    }
-                                ]
-                            }
-                        },
-                        "ran": {
-                            "latency": {
-                                "max": {
-                                    "get_param": "latency"
-                                },
-                                "min": {
-                                    "get_param": "ran_latency"
-                                },
-                                "steps": 1
-                            },
-                            "reliability": {
-                                "values": [
-                                    {
-                                        "get_param": "ran_reliability"
-                                    }
-                                ]
-                            }
-                        },
-                        "transport": {
-                            "latency": {
-                                "max": {
-                                    "get_param": "latency"
-                                },
-                                "min": {
-                                    "get_param": "tn_latency"
-                                },
-                                "steps": 1
-                            },
-                            "reliability": {
-                                "values": [
-                                    {
-                                        "get_param": "tn_reliability"
-                                    }
-                                ]
-                            }
-                        }
-                        }
-                    },
-                    "inventory_provider": "generator",
-                    "inventory_type": "slice_profiles",
-                    "unique": "true"
-                }
-            ]
-        },
-        "homing_template_version": "2020-08-13",
-        "optimization": {
-            "goal": "minimize",
-            "operation_function": {
-                "operands": [
-                    {
-                        "function": "attribute",
-                        "params": {
-                            "attribute": "creation_cost",
-                            "demand": "URLLC"
-                        }
-                    }
-                ],
-                "operator": "sum"
-            }
-        },
-        "parameters": {
-            "core_latency": 10,
-            "core_reliability": 99.9,
-            "latency": 30,
-            "ran_latency": 7,
-            "ran_reliability": 99.9,
-            "reliability": 99.9,
-            "tn_latency": 10,
-            "tn_reliability": 99.9
-        }
-    },
-    "timeout": 1200
-}
diff --git a/tests/optf-has/has/data/nsi_selection_template_with_reuse.json b/tests/optf-has/has/data/nsi_selection_template_with_reuse.json
deleted file mode 100644 (file)
index 3cce5f9..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-{
-    "files": {},
-    "limit": 10,
-    "name": "urllc_sample",
-    "num_solution": "1",
-    "template": {
-        "constraints": {
-            "URLLC_Threshold": {
-                "demands": [
-                    "URLLC"
-                ],
-                "properties": {
-                    "evaluate": [
-                        {
-                            "attribute": "latency",
-                            "operator": "lte",
-                            "threshold": {
-                                "get_param": "latency"
-                            },
-                            "unit": "ms"
-                        },
-                        {
-                            "attribute": "reliability",
-                            "operator": "gte",
-                            "threshold": {
-                                "get_param": "reliability"
-                            },
-                            "unit": ""
-                        }
-                    ]
-                },
-                "type": "threshold"
-            }
-        },
-        "demands": {
-            "URLLC": [
-                {
-                    "default_attributes": {
-                        "creation_cost": 0.1
-                    },
-                    "filtering_attributes": {
-                        "service-function": "shared",
-                        "model-invariant-id": "21d57d4b-52ad-4d3c-a798-248b5bb9124a",
-                        "model-version-id": "bfba363e-e39c-4bd9-a9d5-1371c28f4d22",
-                        "service-role": "nsi"
-                    },
-                    "inventory_provider": "aai",
-                    "inventory_type": "nsi",
-                    "unique": "true"
-                },
-                {
-                    "default_attributes": {
-                        "creation_cost": 0.9
-                    },
-                    "filtering_attributes": {
-                        "service_profile": {
-                                        "latency": {"value": {"get_param": "latency"}, "operator": "lte"},
-                                        "reliability": {"value": {"get_param": "reliability"}, "operator": "gte"}
-                                  },
-                        "subnets":{
-                        "core": {
-                            "latency": {
-                                "max": {
-                                    "get_param": "latency"
-                                },
-                                "min": {
-                                    "get_param": "core_latency"
-                                },
-                                "steps": 1
-                            },
-                            "reliability": {
-                                "values": [
-                                    {
-                                        "get_param": "core_reliability"
-                                    }
-                                ]
-                            }
-                        },
-                        "ran": {
-          
-                            "latency": {
-                                "max": {
-                                    "get_param": "latency"
-                                },
-                                "min": {
-                                    "get_param": "ran_latency"
-                                },
-                                "steps": 1
-                            },
-                            "reliability": {
-                                "values": [
-                                    {
-                                        "get_param": "ran_reliability"
-                                    }
-                                ]
-                            }
-                        },
-                        "transport": {
-                            "latency": {
-                                "max": {
-                                    "get_param": "latency"
-                                },
-                                "min": {
-                                    "get_param": "tn_latency"
-                                },
-                                "steps": 1
-                            },
-                            "reliability": {
-                                "values": [
-                                    {
-                                        "get_param": "tn_reliability"
-                                    }
-                                ]
-                            }
-                        }
-                        }
-                    },
-                    "inventory_provider": "generator",
-                    "inventory_type": "slice_profiles",
-                    "unique": "true"
-                }
-            ]
-        },
-        "homing_template_version": "2020-08-13",
-        "optimization": {
-            "goal": "minimize",
-            "operation_function": {
-                "operands": [
-                    {
-                        "function": "attribute",
-                        "params": {
-                            "attribute": "creation_cost",
-                            "demand": "URLLC"
-                        }
-                    }
-                ],
-                "operator": "sum"
-            }
-        },
-        "parameters": {
-            "core_latency": 10,
-            "core_reliability": 99.9,
-            "latency": 30,
-            "ran_latency": 7,
-            "ran_reliability": 99.9,
-            "reliability": 99.9,
-            "tn_latency": 10,
-            "tn_reliability": 99.9
-        }
-    },
-    "timeout": 1200
-}
diff --git a/tests/optf-has/has/data/nssi_selection_template.json b/tests/optf-has/has/data/nssi_selection_template.json
deleted file mode 100644 (file)
index e165694..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-   "files": {},
-   "limit": 10,
-   "name": "urllc_sample",
-   "num_solution": "1",
-   "timeout": 1200,
-   "template": {
-      "homing_template_version": "2020-08-13",
-      "parameters": {
-         "latency": 30,
-         "reliability": 99.9
-      },
-      "demands": {
-         "URLLC_core": [
-            {
-               "default_attributes": {
-                  "creation_cost": 0.1
-               },
-               "filtering_attributes": {
-                  "service-function": "shared",
-                  "model-invariant-id": "c343a533-c045-4ec0-bbb6-f30eb8eb5a41",
-                  "model-version-id": "8d770214-d3e7-43ea-b7a6-9b235dcbcd34",
-                  "service-role": "nssi"
-               },
-               "inventory_provider": "aai",
-               "inventory_type": "nssi",
-               "unique": "true"
-            }
-         ]
-      },
-      "constraints": {
-         "URLLC_Threshold": {
-            "demands": [
-               "URLLC_core"
-            ],
-            "properties": {
-               "evaluate": [
-                  {
-                     "attribute": "latency",
-                     "operator": "lte",
-                     "threshold": {
-                        "get_param": "latency"
-                     },
-                     "unit": "ms"
-                  },
-                  {
-                     "attribute": "reliability",
-                     "operator": "gte",
-                     "threshold": {
-                        "get_param": "reliability"
-                     },
-                     "unit": ""
-                  }
-               ]
-            },
-            "type": "threshold"
-         }
-      },
-      "optimization": {
-         "goal": "minimize",
-         "operation_function": {
-            "operands": [
-               {
-                  "function": "attribute",
-                  "params": {
-                     "attribute": "latency",
-                     "demand": "URLLC_core"
-                  }
-               }
-            ],
-            "operator": "sum"
-         }
-      }
-   }
-}
diff --git a/tests/optf-has/has/data/nssi_selection_template_unmatched.json b/tests/optf-has/has/data/nssi_selection_template_unmatched.json
deleted file mode 100644 (file)
index 23500c5..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-   "files": {},
-   "limit": 10,
-   "name": "urllc_sample",
-   "num_solution": "1",
-   "timeout": 1200,
-   "template": {
-      "homing_template_version": "2020-08-13",
-      "parameters": {
-         "latency": 5,
-         "reliability": 99.9
-      },
-      "demands": {
-         "URLLC_core": [
-            {
-               "default_attributes": {
-                  "creation_cost": 0.1
-               },
-               "filtering_attributes": {
-                  "service-function": "shared",
-                  "model-invariant-id": "c343a533-c045-4ec0-bbb6-f30eb8eb5a41",
-                  "model-version-id": "8d770214-d3e7-43ea-b7a6-9b235dcbcd34",
-                  "service-role": "nssi"
-               },
-               "inventory_provider": "aai",
-               "inventory_type": "nssi",
-               "unique": "true"
-            }
-         ]
-      },
-      "constraints": {
-         "URLLC_Threshold": {
-            "demands": [
-               "URLLC_core"
-            ],
-            "properties": {
-               "evaluate": [
-                  {
-                     "attribute": "latency",
-                     "operator": "lte",
-                     "threshold": {
-                        "get_param": "latency"
-                     },
-                     "unit": "ms"
-                  },
-                  {
-                     "attribute": "reliability",
-                     "operator": "gte",
-                     "threshold": {
-                        "get_param": "reliability"
-                     },
-                     "unit": ""
-                  }
-     
-               ]
-            },
-            "type": "threshold"
-         }
-      },
-      "optimization": {
-         "goal": "minimize",
-         "operation_function": {
-            "operands": [
-               {
-                  "function": "attribute",
-                  "params": {
-                     "attribute": "latency",
-                     "demand": "URLLC_core"
-                  }
-               }
-            ],
-            "operator": "sum"
-         }
-      }
-   }
-}
diff --git a/tests/optf-has/has/data/nst_selection_template.json b/tests/optf-has/has/data/nst_selection_template.json
deleted file mode 100644 (file)
index 4181914..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-   "name":"urllc_sample",
-   "files":{
-   },
-   "limit":10,
-   "num_solution":"1",
-   "timeout":1200,
-   "template":{
-      "homing_template_version":"2020-08-13",
-      "demands":{
-         "nst_demand":[
-            {
-               "inventory_provider":"aai",
-               "inventory_type":"nst",
-               "unique":"true",
-               "region":"RegionOne",
-               "filtering_attributes":{
-                  "model-role":"nst"
-               }
-            }
-         ]
-      },
-      "constraints":{
-         "nst_Threshold":{
-            "type":"threshold",
-            "demands":[
-               "nst_demand"
-            ],
-            "properties":{
-               "evaluate":[
-                  {
-                     "attribute":"latency",
-                     "operator":"lte",
-                     "threshold":30,
-                     "unit":"ms"
-                  }
-               ]
-            }
-         }      },
-      "optimization":{
-         "goal": "minimize",
-         "operation_function": {
-            "operator": "sum",
-            "operands": [{
-               "function": "attribute",
-               "params": {
-                  "demand": "nst_demand",
-                  "attribute": "latency"
-               }
-            }]
-         }
-      }
-   }
-}
\ No newline at end of file
diff --git a/tests/optf-has/has/data/onboard.json b/tests/optf-has/has/data/onboard.json
deleted file mode 100644 (file)
index a4939c4..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-{ 
-   "appname": "conductor", 
-   "userId": "conductor", 
-   "isAAF": "false", 
-   "password": "c0nduct0r" 
-}
diff --git a/tests/optf-has/has/data/plan_with_hpa.json b/tests/optf-has/has/data/plan_with_hpa.json
deleted file mode 100644 (file)
index 2198577..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-{
-   "name":"vCPE-with-HPA",
-   "template":{
-      "homing_template_version":"2017-10-10",
-      "parameters":{
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{
-         "customer_loc":{
-            "latitude":{
-               "get_param":"customer_lat"
-            },
-            "longitude":{
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{
-         "vG":[
-            {
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{
-        "constraint_vg_customer":{
-            "type":"distance_to_location",
-            "demands":[
-               "vG"
-            ],
-            "properties":{
-               "distance":"< 100 km",
-               "location":"customer_loc"
-            }
-         },
-        "hpa_constraint":{
-            "type":"hpa",
-            "demands":[
-               "vG"
-            ],
-            "properties":{
-               "evaluate":[
-                  {
-                     "id":"vg_1",
-                     "type":"vnfc",
-                     "directives":[
-                         {
-                            "type": "flavor_directives",
-                            "attributes":[
-                                 {
-                                    "attribute_name":"flavor_label_1",
-                                    "attribute_value":""
-                                 }
-                            ]
-                         }
-                     ],
-                     "flavorProperties":[
-                        {
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "score": "5",
-                           "directives": [],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"4",
-                                 "operator":">="
-                              },
-                              {
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"4",
-                                 "operator":">=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        },
-                        {
-                           "hpa-feature":"numa",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "score": "5",
-                           "directives": [],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"numaNodes",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaCpu-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaCpu-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaMem-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              },
-                              {
-                                 "hpa-attribute-key":"numaMem-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        },
-                        {
-                           "hpa-feature":"cpuPinning",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "score": "5",
-                           "directives": [],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"logicalCpuThreadPinningPolicy",
-                                 "hpa-attribute-value":"prefer",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"logicalCpuPinningPolicy",
-                                 "hpa-attribute-value":"dedicated",
-                                 "operator":"="
-                              }
-                           ]
-                        }
-                     ]
-                  },
-                  {
-                     "id":"vg_2",
-                     "type":"vnfc",
-                     "directives":[
-                       {
-                         "type":"flavor_directives",
-                         "attributes":[
-                           {
-                             "attribute_name":"flavor_label_2",
-                             "attribute_value":""
-                           }
-                         ]
-                       }
-                     ],
-                     "flavorProperties":[
-                        {
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "score": "5",
-                           "directives":[],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"8",
-                                 "operator":">="
-                              },
-                              {
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"16",
-                                 "operator":">=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        },
-                        {
-                           "hpa-feature":"numa",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "score": "5",
-                           "directives":[],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"numaNodes",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaCpu-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaCpu-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaMem-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              },
-                              {
-                                 "hpa-attribute-key":"numaMem-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        },
-                        {
-                           "hpa-feature":"ovsDpdk",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "score": "5",
-                           "directives":[],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"dataProcessingAccelerationLibrary",
-                                 "hpa-attribute-value":"v18.02",
-                                 "operator":"="
-                              }
-                           ]
-                        }
-                     ]
-                  }
-               ]
-            }
-         }
-      },
-      "optimization":{
-         "minimize":{
-            "sum":[
-               {
-                  "distance_between":[
-                     "customer_loc",
-                     "vG"
-                  ]
-               },
-               {
-                  "distance_between":[
-                     "customer_loc",
-                     "vG"
-                  ]
-               }
-            ]
-         }
-      }
-   },
-   "timeout":5,
-   "limit":3
-}
diff --git a/tests/optf-has/has/data/plan_with_hpa_requirements_mandatory.json b/tests/optf-has/has/data/plan_with_hpa_requirements_mandatory.json
deleted file mode 100644 (file)
index bb613ab..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-{  
-   "name":"vCPE-with-HPA-requirement-mandatory",
-   "template":{  
-      "homing_template_version":"2017-10-10",
-      "parameters":{  
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{  
-         "customer_loc":{  
-            "latitude":{  
-               "get_param":"customer_lat"
-            },
-            "longitude":{  
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{  
-         "vG":[  
-            {  
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{  
-         "constraint_vg_customer":{  
-            "type":"distance_to_location",
-            "demands":[  
-               "vG"
-            ],
-            "properties":{  
-               "distance":"< 100 km",
-               "location":"customer_loc"
-            }
-         },
-         "hpa_constraint":{  
-            "type":"hpa",
-            "demands":[  
-               "vG"
-            ],
-            "properties":{  
-               "evaluate":[  
-                  {  
-                     "id":"vg_1",
-                     "type":"vnfc",
-                     "directives":[
-                        {
-                           "type":"flavor_directives",
-                           "attributes":[
-                              {
-                                 "attribute_name":"flavor_label_1",
-                                 "attribute_value":""
-                              }
-                           ]
-                        }
-                     ],
-                     "flavorProperties":[  
-                        {  
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "True",
-                           "directives":[],
-                           "hpa-feature-attributes":[  
-                              {  
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"64",
-                                 "operator":"="
-                              },
-                              {  
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"64",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        },
-                        {  
-                           "hpa-feature":"numa",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory":"True",
-                           "directives":[],
-                           "hpa-feature-attributes":[  
-                              {  
-                                 "hpa-attribute-key":"numaNodes",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {  
-                                 "hpa-attribute-key":"numaCpu-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {  
-                                 "hpa-attribute-key":"numaCpu-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"="
-                              },
-                              {  
-                                 "hpa-attribute-key":"numaMem-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              },
-                              {  
-                                 "hpa-attribute-key":"numaMem-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        }
-                     ]
-                  },
-                  {  
-                     "id":"vg_2",
-                     "type":"vnfc",
-                     "directives":[
-                        {
-                           "type":"flavor_directives",
-                           "attributes":[
-                              {
-                                 "attribute_name":"flavor_label_2",
-                                 "attribute_value":""
-                              }
-                           ]
-                        }
-                     ],
-                     "flavorProperties":[  
-                        {  
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "True",
-                           "directives":[],
-                           "hpa-feature-attributes":[  
-                              {  
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"32",
-                                 "operator":"="
-                              },
-                              {  
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"128",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        },
-                        {  
-                           "hpa-feature":"ovsDpdk",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "True",
-                           "directives":[],
-                           "hpa-feature-attributes":[  
-                              {  
-                                 "hpa-attribute-key":"dataProcessingAccelerationLibrary",
-                                 "hpa-attribute-value":"v18.02",
-                                 "operator":"="
-                              }
-                           ]
-                        }
-                     ]
-                  }
-               ]
-            }
-         }
-      },
-      "optimization":{  
-         "minimize":{  
-            "sum":[  
-               {  
-                  "distance_between":[  
-                     "customer_loc",
-                     "vG"
-                  ]
-               }
-            ]
-         }
-      }
-   },
-   "timeout":5,
-   "limit":3
-}
diff --git a/tests/optf-has/has/data/plan_with_hpa_requirements_optionals.json b/tests/optf-has/has/data/plan_with_hpa_requirements_optionals.json
deleted file mode 100644 (file)
index 50c23ee..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-{
-   "name":"vCPE-HPA-Requirement-Optional",
-   "template":{
-      "homing_template_version":"2017-10-10",
-      "parameters":{
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{
-         "customer_loc":{
-            "latitude":{
-               "get_param":"customer_lat"
-            },
-            "longitude":{
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{
-         "vG":[
-            {
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{
-         "constraint_vg_customer":{
-            "type":"distance_to_location",
-            "demands":[
-               "vG"
-            ],
-            "properties":{
-               "distance":"< 100 km",
-               "location":"customer_loc"
-            }
-         },
-         "hpa_constraint":{
-            "type":"hpa",
-            "demands":[
-               "vG"
-            ],
-            "properties":{
-               "evaluate":[
-                  {
-                     "id":"vg_1",
-                     "type":"vnfc",
-                     "directives":[
-                        {
-                           "type":"flavor_directives",
-                           "attributes":[
-                              {
-                                 "attribute_name":"flavor_label_1",
-                                 "attribute_value":""
-                              }
-                           ]
-                        }
-                     ],
-                     "flavorProperties":[
-                        {
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "True",
-                           "directives":[],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"4",
-                                 "operator":">="
-                              },
-                              {
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"8",
-                                 "operator":">=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        },
-                         {
-                           "hpa-feature":"instructionSetExtensions",
-                           "hpa-version":"v1",
-                           "architecture":"Intel64",
-                           "mandatory": "True",
-                           "directives":[],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"instructionSetExtensions",
-                                 "hpa-attribute-value":["aes", "sse", "avx", "smt"],
-                                 "operator":"ALL",
-                                 "unit":""
-                              }
-                           ]
-                        },
-                        {
-                           "hpa-feature":"numa",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory":"False",
-                           "score":"3",
-                           "directives":[],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"numaNodes",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaCpu-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaCpu-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaMem-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              },
-                              {
-                                 "hpa-attribute-key":"numaMem-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        }
-                     ]
-                  },
-                  {
-                     "id":"vg_2",
-                     "type":"vnfc",
-                     "directives":[
-                        {
-                           "type":"flavor_directives",
-                           "attributes":[
-                              {
-                                 "attribute_name":"flavor_label_2",
-                                 "attribute_value":""
-                              }
-                           ]
-                        }
-                     ],
-                     "flavorProperties":[
-                        {
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "True",
-                           "directives":[],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"4",
-                                 "operator":">="
-                              },
-                              {
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"8",
-                                 "operator":">=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        },
-                         {
-                           "hpa-feature":"ovsDpdk",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "score":"5",
-                           "directives":[],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"dataProcessingAccelerationLibrary",
-                                 "hpa-attribute-value":"v18.02",
-                                 "operator":"="
-                              }
-                           ]
-                        },
-                        {
-                           "hpa-feature":"numa",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory":"False",
-                           "score":"3",
-                           "directives":[],
-                           "hpa-feature-attributes":[
-                              {
-                                 "hpa-attribute-key":"numaNodes",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaCpu-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaCpu-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"="
-                              },
-                              {
-                                 "hpa-attribute-key":"numaMem-0",
-                                 "hpa-attribute-value":"2",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              },
-                              {
-                                 "hpa-attribute-key":"numaMem-1",
-                                 "hpa-attribute-value":"4",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        }
-                     ]
-                  }
-               ]
-            }
-         }
-      },
-      "optimization":{
-         "minimize":{
-            "sum":[
-               {
-                  "distance_between":[
-                     "customer_loc",
-                     "vG"
-                  ]
-               }
-            ]
-         }
-      }
-   },
-   "timeout":5,
-   "limit":3
-}
diff --git a/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json b/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json
deleted file mode 100644 (file)
index 4a6d3bc..0000000
+++ /dev/null
@@ -1,267 +0,0 @@
-{
-  "name": "vCPE-HPA-Requirement-Optional",
-  "template": {
-    "homing_template_version": "2017-10-10",
-    "parameters": {
-      "service_name": "Residential vCPE",
-      "service_id": "vcpe_service_id",
-      "customer_lat": 45.395968,
-      "customer_long": -71.135344,
-      "REQUIRED_MEM": 4,
-      "REQUIRED_DISK": 100,
-      "pnf_id": "some_pnf_id"
-    },
-    "locations": {
-      "customer_loc": {
-        "latitude": {
-          "get_param": "customer_lat"
-        },
-        "longitude": {
-          "get_param": "customer_long"
-        }
-      }
-    },
-    "demands": {
-      "vG": [
-        {
-          "inventory_provider": "aai",
-          "inventory_type": "cloud"
-        }
-      ]
-    },
-    "constraints": {
-      "constraint_vg_customer": {
-        "type": "distance_to_location",
-        "demands": [
-          "vG"
-        ],
-        "properties": {
-          "distance": "< 100 km",
-          "location": "customer_loc"
-        }
-      },
-      "hpa_constraint": {
-        "type": "hpa",
-        "demands": [
-          "vG"
-        ],
-        "properties": {
-          "evaluate": [
-            {
-              "id":"vg_1",
-              "type":"vnfc",
-              "directives":[
-                {
-                  "type":"flavor_directives",
-                  "attributes":[
-                    {
-                      "attribute_name":"flavor_label_1",
-                      "attribute_value":""
-                    }
-                  ]
-                }
-              ],
-              "flavorProperties": [
-                {
-                  "hpa-feature": "basicCapabilities",
-                  "hpa-version": "v1",
-                  "architecture": "generic",
-                  "mandatory": "True",
-                  "directives":[],
-                  "hpa-feature-attributes": [
-                    {
-                      "hpa-attribute-key": "numVirtualCpu",
-                      "hpa-attribute-value": "4",
-                      "operator": ">="
-                    },
-                    {
-                      "hpa-attribute-key": "virtualMemSize",
-                      "hpa-attribute-value": "8",
-                      "operator": ">=",
-                      "unit": "GB"
-                    }
-                  ]
-                },
-                {
-                  "hpa-feature": "instructionSetExtensions",
-                  "hpa-version": "v1",
-                  "architecture": "Intel64",
-                  "mandatory": "True",
-                  "directives":[],
-                  "hpa-feature-attributes": [
-                    {
-                      "hpa-attribute-key": "instructionSetExtensions",
-                      "hpa-attribute-value": [
-                        "aes",
-                        "sse",
-                        "avx",
-                        "smt"
-                      ],
-                      "operator": "ALL",
-                      "unit": ""
-                    }
-                  ]
-                },
-                {
-                  "hpa-feature": "numa",
-                  "hpa-version": "v1",
-                  "architecture": "generic",
-                  "mandatory": "False",
-                  "score": "3",
-                  "directives":[],
-                  "hpa-feature-attributes": [
-                    {
-                      "hpa-attribute-key": "numaNodes",
-                      "hpa-attribute-value": "2",
-                      "operator": "="
-                    },
-                    {
-                      "hpa-attribute-key": "numaCpu-0",
-                      "hpa-attribute-value": "2",
-                      "operator": "="
-                    },
-                    {
-                      "hpa-attribute-key": "numaCpu-1",
-                      "hpa-attribute-value": "4",
-                      "operator": "="
-                    },
-                    {
-                      "hpa-attribute-key": "numaMem-0",
-                      "hpa-attribute-value": "2",
-                      "operator": "=",
-                      "unit": "GB"
-                    },
-                    {
-                      "hpa-attribute-key": "numaMem-1",
-                      "hpa-attribute-value": "4",
-                      "operator": "=",
-                      "unit": "GB"
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              "id":"vg_2",
-              "type":"vnfc",
-              "directives":[
-                {
-                  "type":"flavor_directives",
-                  "attributes":[
-                    {
-                      "attribute_name":"flavor_label_2",
-                      "attribute_value":""
-                    }
-                  ]
-                }
-              ],
-              "flavorProperties": [
-                {
-                  "hpa-feature": "basicCapabilities",
-                  "hpa-version": "v1",
-                  "architecture": "generic",
-                  "mandatory": "True",
-                  "directives":[],
-                  "hpa-feature-attributes": [
-                    {
-                      "hpa-attribute-key": "numVirtualCpu",
-                      "hpa-attribute-value": "4",
-                      "operator": ">="
-                    },
-                    {
-                      "hpa-attribute-key": "virtualMemSize",
-                      "hpa-attribute-value": "8",
-                      "operator": ">=",
-                      "unit": "GB"
-                    }
-                  ]
-                },
-                {
-                  "hpa-feature": "ovsDpdk",
-                  "hpa-version": "v1",
-                  "architecture": "generic",
-                  "mandatory": "False",
-                  "score": "5",
-                  "directives":[],
-                  "hpa-feature-attributes": [
-                    {
-                      "hpa-attribute-key": "dataProcessingAccelerationLibrary",
-                      "hpa-attribute-value": "v18.02",
-                      "operator": "="
-                    }
-                  ]
-                },
-                {
-                  "hpa-feature": "numa",
-                  "hpa-version": "v1",
-                  "architecture": "generic",
-                  "mandatory": "False",
-                  "score": "3",
-                  "directives":[],
-                  "hpa-feature-attributes": [
-                    {
-                      "hpa-attribute-key": "numaNodes",
-                      "hpa-attribute-value": "2",
-                      "operator": "="
-                    },
-                    {
-                      "hpa-attribute-key": "numaCpu-0",
-                      "hpa-attribute-value": "2",
-                      "operator": "="
-                    },
-                    {
-                      "hpa-attribute-key": "numaCpu-1",
-                      "hpa-attribute-value": "4",
-                      "operator": "="
-                    },
-                    {
-                      "hpa-attribute-key": "numaMem-0",
-                      "hpa-attribute-value": "2",
-                      "operator": "=",
-                      "unit": "GB"
-                    },
-                    {
-                      "hpa-attribute-key": "numaMem-1",
-                      "hpa-attribute-value": "4",
-                      "operator": "=",
-                      "unit": "GB"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "optimization": {
-      "minimize": {
-        "sum": [
-          {
-            "product": [
-              100,
-              {
-                "distance_between": [
-                  "customer_loc",
-                  "vG"
-                ]
-              }
-            ]
-          },
-          {
-            "product": [
-              200,
-              {
-                "hpa_score": [
-                  "vG"
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "timeout": 5,
-  "limit": 3
-}
diff --git a/tests/optf-has/has/data/plan_with_hpa_simple.json b/tests/optf-has/has/data/plan_with_hpa_simple.json
deleted file mode 100644 (file)
index d343dc8..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-{  
-   "name":"vCPE-with-HPA",
-   "template":{  
-      "homing_template_version":"2017-10-10",
-      "parameters":{  
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{  
-         "customer_loc":{  
-            "latitude":{  
-               "get_param":"customer_lat"
-            },
-            "longitude":{  
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{
-         "vG":[  
-            {  
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{  
-        "hpa_constraint":{  
-            "type":"hpa",
-            "demands":[  
-               "vG"
-            ],
-            "properties":{  
-               "evaluate":[  
-                  {  
-                     "id":"vg_1",
-                     "type":"vnfc",
-                     "directives":[
-                         {
-                            "type":"flavor_directives",
-                            "attributes":[
-                               {
-                                  "attribute_name":"flavor_label_1",
-                                  "attribute_value":""
-                               }
-                            ]
-                         }
-                     ],
-                     "flavorProperties":[  
-                        {  
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "directives":[],
-                           "score": "5",
-                           "hpa-feature-attributes":[  
-                              {  
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"32",
-                                 "operator":"="
-                              },
-                              {  
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"64",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        },
-                        {  
-                           "hpa-feature":"ovsDpdk",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "directives":[],
-                           "score": "5",
-                           "hpa-feature-attributes":[  
-                              {  
-                                 "hpa-attribute-key":"dataProcessingAccelerationLibrary",
-                                 "hpa-attribute-value":"v18.02",
-                                 "operator":"="
-                              }
-                           ]
-                        }
-                     ]
-                  },
-                  {  
-                     "id":"vg_2",
-                     "type":"vnfc",
-                     "directives":[
-                         {
-                            "type":"flavor_directives",
-                            "attributes":[
-                               {
-                                  "attribute_name":"flavor_label_2",
-                                  "attribute_value":""
-                               }
-                            ]
-                         }
-                     ],
-                     "flavorProperties":[  
-                        {  
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "False",
-                           "directives":[],
-                           "score": "5",
-                           "hpa-feature-attributes":[  
-                              {  
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"8",
-                                 "operator":">="
-                              },
-                              {  
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"16",
-                                 "operator":">=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        }
-                     ]
-                  }
-               ]
-            }
-         }
-      },
-      "optimization":{  
-         "minimize":{  
-            "sum":[  
-               {  
-                  "distance_between":[  
-                     "customer_loc",
-                     "vG"
-                  ]
-               },
-               {  
-                  "distance_between":[  
-                     "customer_loc",
-                     "vG"
-                  ]
-               }
-            ]
-         }
-      }
-   },
-   "timeout":5,
-   "limit":3
-}
diff --git a/tests/optf-has/has/data/plan_with_hpa_unmatched.json b/tests/optf-has/has/data/plan_with_hpa_unmatched.json
deleted file mode 100644 (file)
index e95eced..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-{  
-   "name":"vCPE-with-HPA-unmatched-requirements",
-   "template":{  
-      "homing_template_version":"2017-10-10",
-      "parameters":{  
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{  
-         "customer_loc":{  
-            "latitude":{  
-               "get_param":"customer_lat"
-            },
-            "longitude":{  
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{  
-         "vG":[  
-            {  
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{  
-         "constraint_vgmux_customer":{  
-            "type":"distance_to_location",
-            "demands":[  
-               "vG"
-            ],
-            "properties":{  
-               "distance":"< 100 km",
-               "location":"customer_loc"
-            }
-         },
-         "hpa_constraint":{  
-            "type":"hpa",
-            "demands":[  
-               "vG"
-            ],
-            "properties":{  
-               "evaluate":[  
-                  {  
-                     "id":"vg_1",
-                     "type":"vnfc",
-                     "directives":[
-                         {
-                            "type":"flavor_directives",
-                            "attributes":[
-                               {
-                                  "attribute_name":"flavor_label_1",
-                                  "attribute_value":""
-                               }
-                            ]
-                         }
-                     ],
-                     "flavorProperties":[  
-                        {  
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory": "True",
-                           "directives":[],
-                           "hpa-feature-attributes":[  
-                              {  
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"60",
-                                 "operator":"="
-                              },
-                              {  
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"64",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        }
-                     ]
-                  },
-                  {  
-                     "id":"vg_2",
-                     "type":"vnfc",
-                     "directives":[
-                         {
-                            "type":"flavor_directives",
-                            "attributes":[
-                               {
-                                  "attribute_name":"flavor_label_2",
-                                  "attribute_value":""
-                               }
-                            ]
-                         }
-                     ],
-                     "flavorProperties":[  
-                        {  
-                           "hpa-feature":"basicCapabilities",
-                           "hpa-version":"v1",
-                           "architecture":"generic",
-                           "mandatory":"True",
-                           "directives":[],
-                           "hpa-feature-attributes":[  
-                              {  
-                                 "hpa-attribute-key":"numVirtualCpu",
-                                 "hpa-attribute-value":"30",
-                                 "operator":"="
-                              },
-                              {  
-                                 "hpa-attribute-key":"virtualMemSize",
-                                 "hpa-attribute-value":"128",
-                                 "operator":"=",
-                                 "unit":"GB"
-                              }
-                           ]
-                        }
-                     ]
-                  }
-               ]
-            }
-         }
-      },
-      "optimization":{  
-         "minimize":{  
-            "sum":[  
-               {  
-                  "distance_between":[  
-                     "customer_loc",
-                     "vG"
-                  ]
-               }
-            ]
-         }
-      }
-   },
-   "timeout":5,
-   "limit":3
-}
diff --git a/tests/optf-has/has/data/plan_with_lati_and_longi.json b/tests/optf-has/has/data/plan_with_lati_and_longi.json
deleted file mode 100644 (file)
index 5e35d6a..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-   "name":"onap template with lati and longi without constraints and without optimizations",
-   "template":{
-      "homing_template_version":"2017-10-10",
-      "parameters":{
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "physical_location":"DLLSTX233",
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{
-         "customer_loc":{
-            "latitude":{
-               "get_param":"customer_lat"
-            },
-            "longitude":{
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{
-         "vG":[
-            {
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{
-
-      },
-      "optimization":{
-
-      }
-   }
-}
-
diff --git a/tests/optf-has/has/data/plan_with_short_distance_constraint.json b/tests/optf-has/has/data/plan_with_short_distance_constraint.json
deleted file mode 100644 (file)
index 68a7e11..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-   "name":"onap template with short distance constraint",
-   "template":{
-      "homing_template_version":"2017-10-10",
-      "parameters":{
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":25.395968,
-         "customer_long":-51.135344,
-         "physical_location":"DLLSTX233",
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{
-         "customer_loc":{
-            "latitude":{
-               "get_param":"customer_lat"
-            },
-            "longitude":{
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{
-         "vG":[
-            {
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{
-         "distance-vg":{
-            "type":"distance_to_location",
-            "demands":[
-               "vG"
-            ],
-            "properties":{
-               "distance":"< 1 km",
-               "location":"customer_loc"
-            }
-         }
-      },
-      "optimization":{
-    "minimize": {
-      "sum": [
-        {
-          "distance_between": [
-            "customer_loc",
-            "vG"
-          ]
-        },
-        {
-          "distance_between": [
-            "customer_loc",
-            "vG"
-          ]
-        }
-      ]
-    }
-      }
-   }
-}
diff --git a/tests/optf-has/has/data/plan_with_vim_fit.json b/tests/optf-has/has/data/plan_with_vim_fit.json
deleted file mode 100644 (file)
index 00a5991..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-{  
-   "name":"vCPE-Sanity1",
-   "template":{  
-      "homing_template_version":"2017-10-10",
-      "parameters":{  
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{  
-         "customer_loc":{  
-            "latitude":{  
-               "get_param":"customer_lat"
-            },
-            "longitude":{  
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{  
-         "vG":[  
-            {  
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{  
-         "constraint_vg_customer":{  
-            "type":"distance_to_location",
-            "demands":[  
-               "vG"
-            ],
-            "properties":{  
-               "distance":"< 100 km",
-               "location":"customer_loc"
-            }
-         },
-         "check_cloud_capacity":{  
-            "type":"vim_fit",
-            "demands":[  
-               "vG"
-            ],
-            "properties":{  
-               "controller":"multicloud",
-               "request":{  
-                  "vCPU":10,
-                  "Memory":{  
-                     "quantity":{  
-                        "get_param":"REQUIRED_MEM"
-                     },
-                     "unit":"GB"
-                  },
-                  "Storage":{  
-                     "quantity":{  
-                        "get_param":"REQUIRED_DISK"
-                     },
-                     "unit":"GB"
-                  }
-               }
-            }
-         }
-      },
-      "optimization":{  
-         "minimize":{  
-            "sum":[  
-               {  
-                  "distance_between":[  
-                     "customer_loc",
-                     "vG"
-                  ]
-               },
-               {  
-                  "distance_between":[  
-                     "customer_loc",
-                     "vG"
-                  ]
-               }
-            ]
-         }
-      }
-   },
-   "timeout":5,
-   "limit":3
-}
diff --git a/tests/optf-has/has/data/plan_with_wrong_distance_constraint.json b/tests/optf-has/has/data/plan_with_wrong_distance_constraint.json
deleted file mode 100644 (file)
index 9f25c2d..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-   "name":"onap template with wrong distance constraint",
-   "template":{
-      "homing_template_version":"2017-10-10",
-      "parameters":{
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "physical_location":"DLLSTX233",
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{
-         "customer_loc":{
-            "latitude":{
-               "get_param":"customer_lat"
-            },
-            "longitude":{
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{
-         "vG":[
-            {
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{
-         "distance-vg":{
-            "demands":[
-               "vG"
-            ],
-            "properties":{
-               "distance":"< 1 km",
-               "location":"customer_loc"
-            }
-         }
-      },
-      "optimization":{
-    "minimize": {
-      "sum": [
-        {
-          "distance_between": [
-            "customer_loc",
-            "vG"
-          ]
-        },
-        {
-          "distance_between": [
-            "customer_loc",
-            "vG"
-          ]
-        }
-      ]
-    }
-      }
-   }
-}
diff --git a/tests/optf-has/has/data/plan_with_wrong_version.json b/tests/optf-has/has/data/plan_with_wrong_version.json
deleted file mode 100644 (file)
index c0618bf..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-   "name":"onap template with wrong version",
-   "template":{
-      "homing_template_version":"xxxx-yy-zz",
-      "parameters":{
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "physical_location":"DLLSTX233",
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{
-         "customer_loc":{
-            "latitude":{
-               "get_param":"customer_lat"
-            },
-            "longitude":{
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{
-         "vG":[
-            {
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{
-
-      },
-      "optimization":{
-
-      }
-   }
-}
-
diff --git a/tests/optf-has/has/data/plan_without_demand_section.json b/tests/optf-has/has/data/plan_without_demand_section.json
deleted file mode 100644 (file)
index fe5d2fa..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "name":"onap template without demand section",
-   "template":{
-      "homing_template_version":"2017-10-10",
-      "parameters":{
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "physical_location":"DLLSTX233",
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{
-         "customer_loc":{
-            "latitude":{
-               "get_param":"customer_lat"
-            },
-            "longitude":{
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "constraints":{
-
-      },
-      "optimization":{
-
-      }
-   }
-}
-
diff --git a/tests/optf-has/has/optf_has_test.robot b/tests/optf-has/has/optf_has_test.robot
deleted file mode 100644 (file)
index 6085bce..0000000
+++ /dev/null
@@ -1,726 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       json
-
-*** Variables ***
-${MESSAGE}    {"ping": "ok"}
-${BASIC}    Basic
-${Music_AUTHVALUE}    Y29uZHVjdG9yOmMwbmR1Y3Qwcg==
-${HAS_AUTHVALUE}    YWRtaW4xOnBsYW4uMTU=
-${Music_Auth}    ${BASIC} ${Music_AUTHVALUE}
-${HAS_Auth}    ${BASIC} ${HAS_AUTHVALUE}
-${RESP_STATUS}     "error"
-${RESP_MESSAGE_WRONG_VERSION}    "conductor_template_version must be one of: 2016-11-01"
-${RESP_MESSAGE_WITHOUT_DEMANDS}    Undefined Demand
-
-#global variables
-${generatedPlanId}
-${generatedAID}
-${resultStatus}
-
-*** Test Cases ***
-Check Cassandra Docker Container
-    [Documentation]    It checks cassandra docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    music-db
-
-Check Zookeeper Docker Container
-    [Documentation]    It checks zookeeper docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    music-zk
-
-Check Tomcat Docker Container
-    [Documentation]    It checks tomcat docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    music-tomcat
-
-Check Music War Docker Container
-    [Documentation]    It checks music.war docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    music-war
-
-Get Music Version
-    [Documentation]    It sends a REST GET request to retrieve the Music.war version
-    Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        musicaas   /MUSIC/rest/v2/version     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-
-Check ConductorApi Docker Container
-    [Documentation]    It checks conductor-api docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    cond-api
-
-Check ConductorController Docker Container
-    [Documentation]    It checks conductor-controller docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    cond-cont
-
-Check ConductorSolver Docker Container
-    [Documentation]    It checks conductor-solver docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    cond-solv
-
-Check ConductorReservation Docker Container
-    [Documentation]    It checks conductor-reservation docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    cond-resv
-
-Check ConductorData Docker Container
-    [Documentation]    It checks conductor-data docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    cond-data
-
-Get Root Url
-    [Documentation]    It sends a REST GET request to root url
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Sleep    10s    Wait For 10 seconds
-
-Conductor AddHealthcheck Row Into Music
-    [Documentation]    It sends a REST PUT request to Music to inject healthcheck plan
-    Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}healthcheck.json
-    &{headers}=      Create Dictionary    ns=conductor    Authorization=${Music_Auth}    userId=conductor    password=c0nduct0r   Content-Type=application/json  Accept=application/json
-    ${resp}=         Put Request        musicaas   /MUSIC/rest/v2/keyspaces/conductor/tables/plans/rows?id=healthcheck    data=${data}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Sleep    5s    Wait Injection effectiveness
-
-Healthcheck
-    [Documentation]    It sends a REST GET request to healthcheck url
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/healthcheck     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-
-SendPlanWithWrongVersion
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_wrong_version.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    10s    Wait Plan Resolution
-
-GetPlanWithWrongVersion
-    [Documentation]    It sends a REST GET request to capture error
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    error    ${resultStatus}
-
-SendPlanWithoutDemandSection
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_without_demand_section.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    10s    Wait Plan Resolution
-
-GetPlanWithoutDemandSection
-    [Documentation]    It sends a REST GET request to capture error
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    error    ${resultStatus}
-
-SendPlanWithWrongConstraint
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_wrong_distance_constraint.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    10s    Wait Plan Resolution
-
-GetPlanWithWrongConstraint
-    [Documentation]    It sends a REST GET request to capture error
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    error    ${resultStatus}
-
-
-SendPlanWithLatiAndLongi
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_lati_and_longi.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithLatiAndLongi
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-
-SendPlanWithShortDistanceConstraint
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_short_distance_constraint.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithShortDistanceConstraint
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    not found    ${resultStatus}
-
-SendPlanWithVimFit
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_vim_fit.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithVimFit
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-
-SendPlanWithHpa
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_hpa.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithHpa
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-
-SendPlanWithHpaSimple
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_hpa_simple.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithHpaSimple
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-
-SendPlanWithHpaMandatory
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_hpa_requirements_mandatory.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithHpaMandatory
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-
-SendPlanWithHpaOptionals
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_hpa_requirements_optionals.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithHpaOptionals
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-
-SendPlanWithHpaUnmatched
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_hpa_unmatched.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithHpaUnmatched
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    not found    ${resultStatus}
-
-# HPA Score Multi objective Optimization
-SendPlanWithHpaScoreMultiObj
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}plan_with_hpa_score_multi_objective.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithHpaScoreMultiObj
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    ${vim-id}=    Convert To String      ${response_json['plans'][0]['recommendations'][0]['vG']['candidate']['vim-id']}
-    # ${hpa_score}=    Convert To String      ${response_json['plans'][0]['recommendations']['vG']['hpa_score']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-    Should Be Equal    HPA-cloud_cloud-region-1    ${vim-id}
-
-# NSI selection template
-SendPlanWithNsiSelection
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}nsi_selection_template_with_reuse.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithNsiSelection
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    ${instance_name}=    Convert To String      ${response_json['plans'][0]['recommendations'][0]['URLLC']['candidate']['instance_name']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-    Should Be Equal    nsi_test_0211    ${instance_name}
-
-SendPlanWithNsiSelectionSliceProfile
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}nsi_selection_template_with_create.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithNsiSelectionSliceProfile
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    ${candidate_type}=    Convert To String      ${response_json['plans'][0]['recommendations'][0]['URLLC']['candidate']['inventory_type']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-    Should Be Equal    slice_profiles    ${candidate_type}
-
-SendPlanWithNoNsi
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}nsi_selection_template_with_nonsi.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithNoNsi
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    ${candidate_type}=    Convert To String      ${response_json['plans'][0]['recommendations'][0]['URLLC']['candidate']['inventory_type']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-    Should Be Equal    slice_profiles    ${candidate_type}
-
-SendPlanWithNssiSelection
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}nssi_selection_template.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithNssiSelection
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    ${instance_name}=    Convert To String      ${response_json['plans'][0]['recommendations'][0]['URLLC_core']['candidate']['instance_name']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-    Should Be Equal    nssi_test_0211    ${instance_name}
-
-SendPlanWithNssiSelectionUnmatched
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}nssi_selection_template_unmatched.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithNssiSelectionUnmatched
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    not found    ${resultStatus}
-
-# NST selection template
-SendPlanWithNSTSelection
-    [Documentation]    It sends a POST request to conductor
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}nst_selection_template.json
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        optf-cond   /v1/plans     data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    ${response_json}    json.loads    ${resp.content}
-    ${generatedPlanId}=    Convert To String      ${response_json['id']}
-    Set Global Variable     ${generatedPlanId}
-    Log To Console              generatedPlanId = ${generatedPlanId}
-    Should Be Equal As Integers    ${resp.status_code}    201
-    Sleep    60s    Wait Plan Resolution
-
-GetPlanWithNsTSelection
-    [Documentation]    It sends a REST GET request to capture recommendations
-    Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
-    &{headers}=      Create Dictionary    Authorization=${HAS_Auth}    Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        optf-cond   /v1/plans/${generatedPlanId}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    ${response_json}    json.loads    ${resp.content}
-    ${resultStatus}=    Convert To String      ${response_json['plans'][0]['status']}
-    ${instance_name}=    Convert To String      ${response_json['plans'][0]['recommendations'][0]['nst_demand']['candidate']['model_name']}
-    Set Global Variable     ${resultStatus}
-    Log To Console              resultStatus = ${resultStatus}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-    Should Be Equal    done    ${resultStatus}
-    Should Be Equal    EmbbNst    ${instance_name}
-
-
-*** Keywords ***
-
-
diff --git a/tests/optf-osdf/osdf/__init__.robot b/tests/optf-osdf/osdf/__init__.robot
deleted file mode 100644 (file)
index fb654d7..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-*** Settings ***
-Documentation    Integration - Suite 1
-
-
diff --git a/tests/optf-osdf/osdf/data/pci-opt-request.json b/tests/optf-osdf/osdf/data/pci-opt-request.json
deleted file mode 100644 (file)
index 7ec9ab5..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "requestInfo": {
-    "transactionId": "xxx-xxx-xxxx",
-    "requestId": "yyy-yyy-yyyy",
-    "callbackUrl": "https://wiki.onap.org:5000/callbackUrl/",
-    "sourceId": "SO",
-    "requestType": "create",
-    "numSolutions": 1,
-    "optimizers": [
-      "placement"
-    ],
-    "timeout": 600
-  },
-  "cellInfo": {
-    "networkId": "1000",
-    "cellIdList": [
-      "cell0"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/tests/optf-osdf/osdf/data/placement_request.json b/tests/optf-osdf/osdf/data/placement_request.json
deleted file mode 100644 (file)
index d9b16ca..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "requestInfo": {
-    "transactionId": "xxx-xxx-xxxx",
-    "requestId": "yyy-yyy-yyyy",
-    "callbackUrl": "https://wiki.onap.org:5000/callbackUrl/",
-    "sourceId": "SO",
-    "requestType": "create",
-    "numSolutions": 1,
-    "optimizers": ["placement"],
-    "timeout": 600
-  },
-  "placementInfo": {
-    "requestParameters": { "customerLatitude": 32.89748, "customerLongitude": -97.040443, "customerName": "xyz" },
-    "subscriberInfo": {"globalSubscriberId": "xxx-xx-xxx", "subscriberName": "subscriber_x"},
-    "placementDemands": [
-        {
-            "resourceModuleName": "vGMuxInfra",
-            "serviceResourceId": "vGMuxInfra-xx",
-            "tenantId": "vGMuxInfra-tenant",
-            "resourceModelInfo": {
-                "modelInvariantId": "vGMuxInfra-modelInvariantId",
-                "modelVersionId": "vGMuxInfra-versionId",
-                "modelName": "vGMuxInfra-model",
-                "modelType": "resource",
-                "modelVersion": "1.0",
-                "modelCustomizationName": "vGMuxInfra-customeModelName"
-            }
-        },
-        {
-            "resourceModuleName": "vG",
-            "serviceResourceId": "71d563e8-e714-4393-8f99-cc480144a05e",
-            "tenantId": "vG-tenant",
-            "resourceModelInfo": {
-                "modelInvariantId": "vG-modelInvariantId",
-                "modelVersionId": "vG-versionId",
-                "modelName": "vG-model",
-                "modelType": "resource",
-                "modelVersion": "1.0",
-                "modelCustomizationName": "vG-customeModelName"
-            },
-            "existingCandidates": [
-                {
-                    "identifierType": "serviceInstanceId",
-                    "cloudOwner": "",
-                    "identifiers": ["gjhd-098-fhd-987"]
-                }
-            ],
-            "excludedCandidates": [
-                {
-                    "identifierType": "serviceInstanceId",
-                    "cloudOwner": "",
-                    "identifiers": ["gjhd-098-fhd-987"]
-                },
-                {
-                    "identifierType": "vimId",
-                    "cloudOwner": "vmware",
-                    "identifiers": ["NYMDT67"]
-                }
-            ],
-            "requiredCandidates": [
-                {
-                    "identifierType": "vimId",
-                    "cloudOwner": "amazon",
-                    "identifiers": ["TXAUS219"]
-                }
-            ]
-        }
-    ]
-  },
-  "serviceInfo": {
-    "serviceInstanceId": "d61b2543-5914-4b8f-8e81-81e38575b8ec",
-    "serviceName": "vCPE",
-    "modelInfo": {
-      "modelInvariantId": "vCPE-invariantId",
-      "modelVersionId": "vCPE-versionId",
-      "modelName": "vCPE-model",
-      "modelType": "service",
-      "modelVersion": "1.0",
-      "modelCustomizationName": "vCPE-customeModelName"
-    }
-  },
-  "licenseInfo": {
-      "licenseDemands": [
-        {
-          "resourceModuleName": "vGMuxInfra",
-          "serviceResourceId": "vGMuxInfra-xx",
-          "resourceModelInfo": {
-            "modelInvariantId": "vGMuxInfra-modelInvariantId",
-            "modelVersionId": "vGMuxInfra-versionId",
-            "modelName": "vGMuxInfra-model",
-            "modelType": "resource",
-            "modelVersion": "1.0",
-            "modelCustomizationName": "vGMuxInfra-customeModelName"
-          },
-          "existingLicenses": {
-            "entitlementPoolUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"],
-            "licenseKeyGroupUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"]
-          }
-        }
-      ]
-  }
-}
\ No newline at end of file
diff --git a/tests/optf-osdf/osdf/optf_osdf_setup.robot b/tests/optf-osdf/osdf/optf_osdf_setup.robot
deleted file mode 100644 (file)
index fdf7f3e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Settings ***
-Documentation    Suite description
-Resource          ./resources/common-keywords.robot
-
-*** Test Cases ***
-Check OSDF_SIM Docker Container
-    [Documentation]    It checks osdf_simulator docker container is running
-    Verify Docker RC Status    osdf_sim
-
-Check OSDF Docker Container
-    [Documentation]    It checks optf-osdf docker container is running
-    Verify Docker RC Status    optf-osdf
\ No newline at end of file
diff --git a/tests/optf-osdf/osdf/optf_osdf_test.robot b/tests/optf-osdf/osdf/optf_osdf_test.robot
deleted file mode 100644 (file)
index 79a5750..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-*** Settings ***
-Library       json
-Library       OperatingSystem
-Resource          ./resources/common-keywords.robot
-
-Suite Teardown  Delete All Sessions
-
-*** Variables ***
-${osdf_host}    ${OSDF_HOSTNAME}:${OSDF_PORT}
-&{placement_auth} =    username=test   password=testpwd
-&{wrong_authorization} =    username=test   password=test
-&{pci_auth}=    username=pci_test   password=pci_testpwd
-
-*** Test Cases ***
-Healthcheck
-    [Documentation]    It sends a REST GET request to healthcheck url
-    ${resp}=         Http Get         ${osdf_host}   /api/oof/v1/healthcheck
-    Should Be Equal As Integers    ${resp.status_code}    200
-
-SendPlacementWithInvalidAuth
-    [Documentation]    It sends a POST request to osdf fail authentication
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}placement_request.json
-    ${resp}=         Http Post        host=${osdf_host}   restUrl=/api/oof/v1/placement     data=${data}    auth=${wrong_authorization}
-    ${response_json}    json.loads    ${resp.content}
-    Should Be Equal     Unauthorized, check username and password    ${response_json['serviceException']['text']}
-    Should Be Equal As Integers    ${resp.status_code}    401
-
-SendPlacementWithValidAuth
-    [Documentation]    It sends a POST request to osdf with correct authentication
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}placement_request.json
-    ${resp}=         Http Post        host=${osdf_host}   restUrl=/api/oof/v1/placement     data=${data}    auth=${placement_auth}
-    ${response_json}    json.loads    ${resp.content}
-    Should Be Equal As Integers    ${resp.status_code}    202
-    Should Be Equal     accepted    ${response_json['requestStatus']}
-
-SendPCIOptimizationWithAuth
-    [Documentation]    It sends a POST request PCI Optimization service
-
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}pci-opt-request.json
-    ${resp}=         Http Post        host=${osdf_host}   restUrl=/api/oof/v1/pci     data=${data}    auth=${pci_auth}
-    ${response_json}    json.loads    ${resp.content}
-    Should Be Equal As Integers    ${resp.status_code}    202
-    Should Be Equal     accepted    ${response_json['requestStatus']}
-
-
-
-
-
diff --git a/tests/optf-osdf/osdf/resources/common-keywords.robot b/tests/optf-osdf/osdf/resources/common-keywords.robot
deleted file mode 100644 (file)
index ea45f09..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-*** Settings ***
-Documentation    Suite description
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       json
-Library       RequestsLibrary
-*** Variables ***
-&{headers}=      Content-Type=application/json  Accept=application/json
-*** Keywords ***
-Verify Docker RC Status
-    [Documentation]  Method to verify whether docker instance is up and running
-    [Arguments]  ${process_name}
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    ${process_name}
-
-Http Get
-    [Documentation]  Wrapper for Http GET
-    [Arguments]  ${host}    ${restUrl}
-    Create Session   optf-osdf            ${host}
-    ${resp}=         Get Request        optf-osdf   ${restUrl}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    [Return]  ${resp}
-
-Http Post
-    [Documentation]  Wrapper for Http POST
-    [Arguments]  ${host}    ${restUrl}    ${auth}    ${data}
-    ${pci_auth}=    Create List    ${auth['username']}  ${auth['password']}
-    Create Session   optf-osdf            ${host}    headers=${headers}   auth=${pci_auth}
-    ${resp}=         Post Request        optf-osdf   ${restUrl}    data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    [Return]  ${resp}
-
-Http Put
-    [Documentation]  Wrapper for Http PUT
-    [Arguments]  ${host}    ${restUrl}    ${auth}    ${data}
-    ${pci_auth}=    Create List    ${auth['username']}  ${auth['password']}
-    Create Session   optf-osdf            ${host}    headers=${headers}   auth=${pci_auth}
-    ${resp}=         Put Request        optf-osdf   ${restUrl}    data=${data}     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    [Return]  ${resp}
\ No newline at end of file
index 04b570f..b405105 100644 (file)
@@ -34,7 +34,7 @@ ${RESP_KEY_LINT_WARNING}            lintWarning
 *** Test Cases ***
 
 Verify That Sdc Helm Validator Correctly Responds With Supported Versions Array
-    [Tags]                          SDC_HELM_VALIDATOR_1
+    [Tags]                          VERSIONS_ENDPOINT
     [Documentation]                 Verify that validator correctly responds with supported helm versions array.
     ...                             Send GET request to ask for supported versions array.
     ...                             Should reply with JSON containing an array of Helm versions that are supported by the validator.
@@ -51,7 +51,7 @@ Verify That Sdc Helm Validator Correctly Responds With Supported Versions Array
     END
 
 Verify That Sdc Helm Validator Correctly Responds For Correct Chart Validation Request With Default Version
-    [Tags]                          SDC_HELM_VALIDATOR_2
+    [Tags]                          VALIDATE_ENDPOINT    DEPLOYABLE
     [Documentation]                 Verify that validator correctly responds for correct chart validation request with default version.
     ...                             Send POST request to validate correct chart. Input: Helm chart with api version v2, no additional data.
     ...                             Should reply with JSON containing the following information: used version = 3.x.x, deployable = true, render errors = []
@@ -76,7 +76,7 @@ Verify That Sdc Helm Validator Correctly Responds For Correct Chart Validation R
     Should Be Empty                 ${errors}
 
 Verify That Sdc Helm Validator Correctly Responds For Correct Chart Validation Request With Given V3 Version
-    [Tags]                          SDC_HELM_VALIDATOR_3
+    [Tags]                          VALIDATE_ENDPOINT    DEPLOYABLE
     [Documentation]                 Verify that validator correctly responds for correct chart validation request with given v3 version.
     ...                             Send POST request to validate correct chart. Input: Helm chart with api version v2, desired version = v3.
     ...                             Should reply with JSON containing the following information: used version = 3.x.x, deployable = true, render errors = [].
@@ -97,7 +97,7 @@ Verify That Sdc Helm Validator Correctly Responds For Correct Chart Validation R
     Should Be Empty                 ${errors}
 
 Verify That Sdc Helm Validator Responds With Error For Chart Validation Request With Invalid Version
-    [Tags]                          SDC_HELM_VALIDATOR_4
+    [Tags]                          VALIDATE_ENDPOINT    ERROR
     [Documentation]                 Verify that validator responds with error and 400 status code for validation request with invalid version.
     ...                             Send POST request with correct chart but not supported Helm version. Input: Correct helm chart, desired version = v10.
     ...                             Should reply with JSON containing error message with information regarding not supported Helm version. Response code should be 400.
@@ -112,7 +112,7 @@ Verify That Sdc Helm Validator Responds With Error For Chart Validation Request
     Should Be Equal As Strings      ${resp.text}                   {"message":"Version: 10 is not supported"}
 
 Verify That Sdc Helm Validator Correctly Responds For Correct Chart Validation Request With Random Supported Version
-    [Tags]                          SDC_HELM_VALIDATOR_5
+    [Tags]                          VERSIONS_ENDPOINT    VALIDATE_ENDPOINT
     [Documentation]                 Verify that validator correctly responds for correct chart validation request with random supported version.
     ...                             Send GET request to ask for supported versions array.
     ...                             Should reply with JSON containing an array of Helm versions that are supported by the validator.
@@ -133,7 +133,7 @@ Verify That Sdc Helm Validator Correctly Responds For Correct Chart Validation R
     Status Should Be                200                            ${resp}
 
 Verify That Sdc Helm Validator Correctly Responds For Correct Chart Validation Request With Lint
-    [Tags]                          SDC_HELM_VALIDATOR_6
+    [Tags]                          VALIDATE_ENDPOINT    LINT    DEPLOYABLE    VALID
     [Documentation]                 Verify that validator correctly responds for correct chart validation request with lint.
     ...                             Send POST request to validate correct chart and lint. Input: Helm chart with api version v2, linted = true.
     ...                             Should reply with JSON containing the following information: deployable = true, valid = true, render errors = [], lint errors = [], lint warnings = [].
@@ -160,7 +160,7 @@ Verify That Sdc Helm Validator Correctly Responds For Correct Chart Validation R
     Should Be Empty                 ${lintWarnings}
 
 Verify That Sdc Helm Validator Correctly Responds For Chart Validation Request With Lint Warnings
-    [Tags]                          SDC_HELM_VALIDATOR_7
+    [Tags]                          VALIDATE_ENDPOINT    LINT    DEPLOYABLE    VALID
     [Documentation]                 Verify that validator correctly responds for chart validation request with lint warnings.
     ...                             Send POST request to validate chart and lint. Input: Helm chart that should cause lint warning, linted = true.
     ...                             Should reply with JSON containing the following information: deployable = true, valid = true, render errors = [], lint warning = [not empty]
@@ -188,7 +188,7 @@ Verify That Sdc Helm Validator Correctly Responds For Chart Validation Request W
     Should Contain                  @{lintWarnings}                [WARNING] templates/: directory not found
 
 Verify That Sdc Helm Validator Correctly Responds For Chart Validation Request With Lint Strict Checking
-    [Tags]                          SDC_HELM_VALIDATOR_8
+    [Tags]                          VALIDATE_ENDPOINT    STRICT_LINT    DEPLOYABLE    NON_VALID
     [Documentation]                 Verify that validator correctly responds for chart validation request with lint strict checking.
     ...                             Send POST request to validate chart and strictly lint. Input: Helm chart that should cause lint warning, linted = true, strict linted = true.
     ...                             Should reply with JSON containing the following information: deployable = true, valid = false, render errors = [], lint warning = [not empty].
@@ -216,7 +216,7 @@ Verify That Sdc Helm Validator Correctly Responds For Chart Validation Request W
     Should Contain                  @{lintWarnings}                [WARNING] templates/: directory not found
 
 Verify That Sdc Helm Validator Correctly Responds For Chart Validation Request With Lint And Render Errors
-    [Tags]                          SDC_HELM_VALIDATOR_9
+    [Tags]                          VALIDATE_ENDPOINT    STRICT_LINT    NON_DEPLOYABLE    NON_VALID
     [Documentation]                 Verify that validator correctly responds for chart validation request with lint and render errors.
     ...                             Send POST request to validate chart and strictly lint. Input: Helm chart that should cause lint and render errors, linted = true, strict linted = true.
     ...                             Should reply with JSON containing the following information: deployable = false, valid = false, render errors = [not empty], lint errors = [not empty], lint warnings = [].
index 92224ea..cd3a5b5 100644 (file)
@@ -4,6 +4,9 @@ Library     RequestsLibrary
 Library     OperatingSystem
 Library     json
 
+*** Variables ***
+${SLEEP_INTERVAL_SEC}=   60
+
 *** Test Cases ***
 Distribute Service Template
     Create Session   sdc_controller_session  http://${REPO_IP}:8085
@@ -23,3 +26,4 @@ Macroflow
     Log To Console     Received status code: ${service_instantiation_request.status_code}
     Run Keyword If  '${service_instantiation_request.status_code}' == '202'  log to console   \nexecuted with expected result
     Should Be Equal As Strings    '${service_instantiation_request.status_code}'    '202'
+    SLEEP   ${SLEEP_INTERVAL_SEC}s
index e7d923f..a2c06fe 100644 (file)
@@ -6,9 +6,9 @@ Library     json
 Library     String
 
 *** Variables ***
-${SDNC_KEYSTORE_CONFIG_PATH}    /config/netconf-keystore:keystore
-${SDNC_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator
-${PNFSIM_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist
+${SDNC_KEYSTORE_CONFIG_PATH}    /restconf/config/netconf-keystore:keystore
+${SDNC_MOUNT_PATH}    /restconf/config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator
+${PNFSIM_MOUNT_PATH}    /restconf/config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist
 ${BP_UPLOAD_URL}    /api/v1/blueprint-model/publish
 ${BP_PROCESS_URL}    /api/v1/execution-service/process
 ${BP_ARCHIVE_PATH}    ${CURDIR}/data/blueprint_archive.zip
@@ -17,9 +17,9 @@ ${BP_ARCHIVE_PATH}    ${CURDIR}/data/blueprint_archive.zip
 *** Test Cases ***
 Test SDNC Keystore
     [Documentation]    Checking keystore after SDNC installation
-    Create Session   sdnc  http://localhost:8282/restconf
+    Create Session   sdnc  http://localhost:8282
     &{headers}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/json    Accept=application/json
-    ${resp}=    Get Request    sdnc    ${SDNC_KEYSTORE_CONFIG_PATH}    headers=${headers}
+    ${resp}=    GET On Session    sdnc    ${SDNC_KEYSTORE_CONFIG_PATH}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${keystoreContent}=    Convert To String    ${resp.content}
     Log to console  *************************
@@ -32,7 +32,7 @@ Test BP-PROC upload blueprint archive
     ${bp_archive}=    Get Binary File    ${BP_ARCHIVE_PATH}
     &{bp_file}=    create Dictionary    file    ${bp_archive}
     &{headers}=  Create Dictionary    Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-    ${resp}=    Post Request    blueprint    ${BP_UPLOAD_URL}    files=${bp_file}    headers=${headers}
+    ${resp}=    POST On Session    blueprint    ${BP_UPLOAD_URL}    files=${bp_file}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Test BP-PROC CONFIG-ASSIGN
@@ -41,7 +41,7 @@ Test BP-PROC CONFIG-ASSIGN
     ${config-assign}=    Get File     ${CURDIR}${/}data${/}config-assign.json
     Log to console  ${config-assign}
     &{headers}=  Create Dictionary    Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==    Content-Type=application/json    Accept=application/json
-    ${resp}=    Post Request    blueprint    ${BP_PROCESS_URL}    data=${config-assign}    headers=${headers}
+    ${resp}=    POST On Session    blueprint    ${BP_PROCESS_URL}    data=${config-assign}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Test BP-PROC CONFIG-DEPLOY
@@ -50,20 +50,20 @@ Test BP-PROC CONFIG-DEPLOY
     ${config-deploy}=    Get File     ${CURDIR}${/}data${/}config-deploy.json
     Log to console  ${config-deploy}
     &{headers}=  Create Dictionary    Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==    Content-Type=application/json    Accept=application/json
-    ${resp}=    Post Request    blueprint    ${BP_PROCESS_URL}    data=${config-deploy}    headers=${headers}
+    ${resp}=    POST On Session    blueprint    ${BP_PROCESS_URL}    data=${config-deploy}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Test PNF Configuration update
     [Documentation]    Checking PNF configuration params
-    Create Session   sdnc  http://localhost:8282/restconf
+    Create Session   sdnc  http://localhost:8282
     ${mount}=    Get File     ${CURDIR}${/}data${/}mount.xml
     Log to console  ${mount}
     &{headers}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/xml    Accept=application/xml
-    ${resp}=    Put Request    sdnc    ${SDNC_MOUNT_PATH}    data=${mount}    headers=${headers}
+    ${resp}=    PUT On Session    sdnc    ${SDNC_MOUNT_PATH}    data=${mount}    headers=${headers}
     Should Be Equal As Strings    ${resp.status_code}    201
     Sleep  10
     &{headers1}=  Create Dictionary    Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==    Content-Type=application/json    Accept=application/json
-    ${resp1}=    Get Request    sdnc    ${PNFSIM_MOUNT_PATH}    headers=${headers1}
+    ${resp1}=    GET On Session    sdnc    ${PNFSIM_MOUNT_PATH}    headers=${headers1}
     Should Be Equal As Strings    ${resp1.status_code}    200
     Log to console  ${resp1.content}
     Should Contain  ${resp1.text}     {"netconf-id":30,"netconf-param":3000}