From b6b7bef8bdcad15af01ac88a038dd763ce59f68f Mon Sep 17 00:00:00 2001 From: xg353y Date: Tue, 11 Apr 2017 13:30:42 +0200 Subject: [MSO-8] Update the maven dependency Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes. Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc Signed-off-by: xg353y --- packages/arquillian-unit-tests/pom.xml | 30 +- .../mso/global_tests/IntegrationTestsSuite.java | 4 +- .../mso/global_tests/asdc/ASDCITCase.java | 214 ++-- .../notif_emulator/DistributionClientEmulator.java | 53 +- .../asdc/notif_emulator/JsonResourceInfo.java | 25 +- .../mso/global_tests/soapui/SoapUiITCase.java | 15 +- .../src/test/resources/JMeter/MSO-Perf.jmx | 20 +- .../SoapUI/Healthcheck-soapui-project.xml | 34 +- .../SoapUI/Local-API-Handler-soapui-project.xml | 310 +++--- .../SoapUI/MSONetworkAdapter-soapui-project.xml | 86 +- .../SoapUI/MSOTenantAdapter-soapui-project.xml | 58 +- .../SoapUI/MSOVnfAdapter-soapui-project.xml | 70 +- .../SoapUI/MsoRequestDB-soapui-project.xml | 90 +- .../src/test/resources/arquillian.xml | 4 +- .../src/test/resources/docker/mso/mso-docker.json | 33 +- .../demo-dns-V1/artifacts/vnf-module-artifact.json | 10 +- .../asdc/demo-dns-V1/notif-structure.json | 27 +- .../demo-vfw-V1/artifacts/vnf-module-artifact.json | 5 +- .../asdc/demo-vfw-V1/notif-structure.json | 17 +- .../notif-structure.json | 17 +- .../artifacts/vnf-module-artifact.json | 5 +- .../asdc/simpleNotif-V1/notif-structure.json | 19 +- .../artifacts/vnf-module-artifact.json | 5 +- .../asdc/simpleNotif-V2/notif-structure.json | 19 +- .../artifacts/vnf-module-artifact.json | 5 +- .../asdc/simpleNotif-V3/notif-structure.json | 29 +- .../artifacts/vnf-module-artifact.json | 5 +- .../asdc/simpleNotif-V4/notif-structure.json | 29 +- .../artifacts/vnf-module-artifact.json | 12 +- .../asdc/simpleNotif-V5/notif-structure.json | 39 +- packages/deliveries/pom.xml | 6 +- .../src/main/assembly/war-pack/mso-wars.xml | 33 +- packages/docker/pom.xml | 22 +- .../configuration/application-roles.properties | 3 +- .../configuration/application-users.properties | 3 +- .../automated-tests/create_mso_db-tests.sql | 19 +- .../default/create_mso_db-default.sql | 16 +- .../camunda/mariadb_engine_7.6.0.sql | 1071 ++++++++++++++++++++ .../camunda/mariadb_identity_7.6.0.sql | 88 ++ .../camunda/mysql_updates_7.3.0_to_7.6.0.sql | 699 +++++++++++++ .../sub-sql-files/catalog_add_constraints.sql | 45 + .../sub-sql-files/catalog_timestamp_mso_db.sql | 5 + 42 files changed, 2649 insertions(+), 650 deletions(-) create mode 100644 packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.6.0.sql create mode 100644 packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_identity_7.6.0.sql create mode 100644 packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mysql_updates_7.3.0_to_7.6.0.sql create mode 100644 packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_add_constraints.sql (limited to 'packages') diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml index f90ca550ab..d56688b639 100644 --- a/packages/arquillian-unit-tests/pom.xml +++ b/packages/arquillian-unit-tests/pom.xml @@ -62,12 +62,6 @@ 1.3.16.GA test - - junit - junit - 4.11 - test - org.jboss.arquillian.junit @@ -254,9 +248,9 @@ - org.openecomp.sdc + org.openecomp.sdc.sdc-distribution-client sdc-distribution-client - 1.0.0 + 1.1.6-SNAPSHOT test @@ -359,6 +353,26 @@ + + + org.codehaus.mojo + wagon-maven-plugin + 1.0 + + + download-mariadb-connector + pre-integration-test + + download-single + + + http://central.maven.org/ + maven2/org/mariadb/jdbc/mariadb-java-client/1.5.4/mariadb-java-client-1.5.4.jar + ${project.build.directory}/mariadb-connector + + + + org.apache.maven.plugins maven-failsafe-plugin diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java index a1fa04dd01..f71d2e7fa8 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/IntegrationTestsSuite.java @@ -11,14 +11,14 @@ import org.openecomp.mso.global_tests.soapui.SoapUiITCase; @RunWith(Suite.class) -@SuiteClasses({ +@SuiteClasses({ // MSOUiITCase.class, // AppCAdapterITCase.class, SoapUiITCase.class, ASDCITCase.class, LogsCheckerITCase.class - + }) public class IntegrationTestsSuite { diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java index 47b261afd6..263454359d 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/ASDCITCase.java @@ -10,6 +10,7 @@ import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.LinkedList; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; @@ -30,7 +31,8 @@ import org.junit.runner.RunWith; import org.openecomp.sdc.api.consumer.IDistributionStatusMessage; import org.openecomp.sdc.api.notification.IArtifactInfo; import org.openecomp.sdc.api.notification.IResourceInstance; -import org.openecomp.sdc.api.notification.IVfModuleMetadata; +import org.openecomp.mso.asdc.installer.VfModuleMetaData; +import org.openecomp.mso.asdc.installer.IVfModuleData; import org.openecomp.sdc.utils.DistributionStatusEnum; import org.openecomp.mso.asdc.client.ASDCConfiguration; import org.openecomp.mso.asdc.client.ASDCController; @@ -64,7 +66,7 @@ public class ASDCITCase { } for (File f : dir.listFiles()) { - + if (f.isFile()) { jar.addAsResource(f, destFolder + "/" + f.getName()); } else { @@ -82,16 +84,16 @@ public class ASDCITCase { // Add the current test class JavaArchive testclasses = ShrinkWrap.create (JavaArchive.class, "testClasses.jar"); - + testclasses.addPackage("org.openecomp.mso.global_tests.asdc.notif_emulator"); - + addFiles(testclasses,new File(Thread.currentThread().getContextClassLoader().getResource("resource-examples/asdc").getFile()),"resource-examples/asdc"); - + System.out.println(testclasses.toString(true)); warArchive.addAsLibraries(testclasses); - - - + + + // BE CAREFUL a settings.xml file must be located in ${home.user}/.m2/settings.xml warArchive.addAsLibraries(Maven.resolver() .resolve("org.mockito:mockito-all:1.10.19") @@ -100,11 +102,11 @@ public class ASDCITCase { //warArchive.addPackage("org.openecomp.mso.global_tests.asdc.notif_emulator"); //addFiles(warArchive,new File(ASDCITCase.class.getClassLoader().getResource("resource-examples").getPath()),"resource-examples"); - + // Take one war randomly to make arquilian happy Testable.archiveToTest(warArchive); - - + + System.out.println(warArchive.toString(true)); return warArchive; @@ -117,7 +119,7 @@ public class ASDCITCase { NoSuchAlgorithmException { System.out.println("Executing " + ASDCITCase.class.getName()); } - + @AfterClass public static final void waitAfterStart() throws InterruptedException, IOException, @@ -126,70 +128,70 @@ public class ASDCITCase { System.out.println("Waiting 60000ms " + ASDCITCase.class.getName()); Thread.sleep(60000); } - + /** * Be careful when using that notification fake structure, the UUID of notif artifacts MUST be different. * There is a static Map behind the scene. */ private JsonNotificationData notifDataWithoutModuleInfo; private DistributionClientEmulator distribClientWithoutModuleInfo; - + private JsonNotificationData notifDataV1, notifDataV2, notifDataV3, notifDataV4, notifDataV5,notifDataDNS,notifDataVFW; private DistributionClientEmulator distribClientV1, distribClientV2, distribClientV3, distribClientV4, distribClientV5, distribClientV1ForSameNotif, distribClientDNS,distribClientVFW; - - + + @Before public final void beforeEachTest() throws IOException { distribClientV1= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V1"); distribClientV1ForSameNotif= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V1"); notifDataV1 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V1"); - + // This is a duplicate in version 2 of the version 1 distribClientV2= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V2"); notifDataV2 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V2"); - + distribClientV3= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V3"); notifDataV3 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V3"); - + // This is a duplicate in version 4 of the version 3 distribClientV4= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V4"); notifDataV4 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V4"); - + // This notification is to test the deployment of volume with nested + an artifact not used (should send notification with DEPLOY_ERROR distribClientV5= new DistributionClientEmulator("/resource-examples/asdc/simpleNotif-V5"); notifDataV5 = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/simpleNotif-V5"); - - + + distribClientWithoutModuleInfo= new DistributionClientEmulator("/resource-examples/asdc/notif-without-modules-metadata"); notifDataWithoutModuleInfo = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/notif-without-modules-metadata"); - - + + distribClientDNS= new DistributionClientEmulator("/resource-examples/asdc/demo-dns-V1"); notifDataDNS = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/demo-dns-V1"); - - + + distribClientVFW= new DistributionClientEmulator("/resource-examples/asdc/demo-vfw-V1"); notifDataVFW = JsonNotificationData.instantiateNotifFromJsonFile("/resource-examples/asdc/demo-vfw-V1"); - - + + } - + @Test @OperateOnDeployment("asdc-controller") public void testNotifWithoutModuleInfo () throws NoSuchAlgorithmException, IOException, URISyntaxException, ArtifactInstallerException, ASDCControllerException, ASDCParametersException { - - - + + + ASDCController asdcController = new ASDCController("asdc-controller1", distribClientWithoutModuleInfo); asdcController.initASDC(); asdcController.treatNotification(notifDataWithoutModuleInfo); - + assertTrue(distribClientWithoutModuleInfo.getDistributionMessageReceived().size() > 0); - + int badDeployment=0; for (IDistributionStatusMessage message:distribClientWithoutModuleInfo.getDistributionMessageReceived()) { System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name()); @@ -198,23 +200,23 @@ public class ASDCITCase { } } assertTrue(badDeployment == 3); - + // Check if something has been recorder in DB, as it should not CatalogDatabase catalogDB = new CatalogDatabase(); - + HeatTemplate heatTemplate = catalogDB.getHeatTemplate("Whot-nimbus-oam_v1.0.yaml", "1.0", "resourceName-1"); assertNull(heatTemplate); } - - private void validateVnfResource(JsonNotificationData inputNotification,List moduleList) { - + + private void validateVnfResource(JsonNotificationData inputNotification, List moduleList) { + CatalogDatabase catalogDB = new CatalogDatabase(); - - + + for (IResourceInstance resource:inputNotification.getResources()) { VnfResource vnfResourceDB = catalogDB.getVnfResource(inputNotification.getServiceName()+"/"+resource.getResourceInstanceName(), inputNotification.getServiceVersion()); assertNotNull(vnfResourceDB); - + assertTrue(vnfResourceDB.getAsdcUuid().equals(resource.getResourceUUID())); assertTrue(vnfResourceDB.getDescription().equals(inputNotification.getServiceDescription())); assertTrue(vnfResourceDB.getModelInvariantUuid().equals(resource.getResourceInvariantUUID())); @@ -225,19 +227,19 @@ public class ASDCITCase { assertTrue(vnfResourceDB.getModelCustomizationName().equals(resource.getResourceInstanceName())); assertTrue(vnfResourceDB.getModelName().equals(resource.getResourceName())); assertTrue(vnfResourceDB.getServiceModelInvariantUUID().equals(inputNotification.getServiceInvariantUUID())); - - for (IVfModuleMetadata module:moduleList) { - + + for (IVfModuleData module:moduleList) { + VfModule vfModuleDB = catalogDB.getVfModuleModelName(module.getVfModuleModelName(),inputNotification.getServiceVersion()); assertNotNull(vfModuleDB); assertTrue(module.getVfModuleModelName().equals(vfModuleDB.getModelName())); - + assertTrue((inputNotification.getServiceName()+"/"+resource.getResourceInstanceName()+"::"+vfModuleDB.getModelName()).equals(vfModuleDB.getType())); assertTrue(vnfResourceDB.getId()!=0); assertNotNull(vfModuleDB.getVnfResourceId()); - + assertTrue(vnfResourceDB.getId()==vfModuleDB.getVnfResourceId().intValue()); - + for (String artifactUUID:module.getArtifacts()) { IArtifactInfo artifact = null; for (IArtifactInfo artifactTemp:resource.getArtifacts()) { @@ -247,7 +249,7 @@ public class ASDCITCase { } } assertNotNull(artifact); - + switch (artifact.getArtifactType()) { case ASDCConfiguration.HEAT: HeatTemplate heatTemplateDB= catalogDB.getHeatTemplate(vfModuleDB.getTemplateId()); @@ -257,63 +259,63 @@ public class ASDCITCase { assertTrue(heatTemplateDB.getDescription().equals(artifact.getArtifactDescription())); assertTrue(heatTemplateDB.getTemplateBody() != null && !heatTemplateDB.getTemplateBody().isEmpty()); assertTrue(heatTemplateDB.getParameters().size()>0); - + assertTrue(heatTemplateDB.getTemplateName().equals(artifact.getArtifactName())); - + if (artifact.getArtifactTimeout() != null) { assertTrue(heatTemplateDB.getTimeoutMinutes()== artifact.getArtifactTimeout().intValue()); } else { assertTrue(heatTemplateDB.getTimeoutMinutes()== 240); } assertTrue(heatTemplateDB.getVersion().equals(artifact.getArtifactVersion())); - + assertFalse(heatTemplateDB.getTemplateBody().contains("file:///")); break; case ASDCConfiguration.HEAT_ENV: - + HeatEnvironment heatEnvironmentDB = catalogDB.getHeatEnvironment(artifact.getArtifactName(), artifact.getArtifactVersion(), inputNotification.getServiceName()+"/"+resource.getResourceInstanceName()); - + assertNotNull(heatEnvironmentDB); assertTrue((vfModuleDB.getVolEnvironmentId() != null && vfModuleDB.getVolEnvironmentId().intValue() == heatEnvironmentDB.getId()) || (vfModuleDB.getEnvironmentId() != null && vfModuleDB.getEnvironmentId() == heatEnvironmentDB.getId())); - + assertTrue(heatEnvironmentDB.getAsdcResourceName().equals(inputNotification.getServiceName()+"/"+resource.getResourceInstanceName())); - + assertTrue(heatEnvironmentDB.getAsdcUuid().equals(artifact.getArtifactUUID())); assertTrue(heatEnvironmentDB.getDescription().equals(artifact.getArtifactDescription())); assertTrue(heatEnvironmentDB.getVersion().equals(artifact.getArtifactVersion())); assertTrue(heatEnvironmentDB.getName().equals(artifact.getArtifactName())); assertTrue(heatEnvironmentDB.getEnvironment() != null); assertFalse(heatEnvironmentDB.getEnvironment().contains("file:///")); - + break; case ASDCConfiguration.HEAT_NESTED: Map listNestedDBMainHeat=new HashMap(); Map listNestedDBVolHeat=new HashMap(); - + if (vfModuleDB.getTemplateId() != null) { listNestedDBMainHeat = catalogDB.getNestedTemplates(vfModuleDB.getTemplateId()); } if (vfModuleDB.getVolTemplateId() != null) { listNestedDBVolHeat = catalogDB.getNestedTemplates(vfModuleDB.getVolTemplateId()); } - + assertTrue(listNestedDBMainHeat.size() > 0 || listNestedDBVolHeat.size() > 0); - - - assertTrue(listNestedDBMainHeat.get(artifact.getArtifactName()) != null + + + assertTrue(listNestedDBMainHeat.get(artifact.getArtifactName()) != null || listNestedDBVolHeat.get(artifact.getArtifactName()) != null); - + HeatTemplate rightNestedTemplateDB = catalogDB.getHeatTemplate(artifact.getArtifactName(), artifact.getArtifactVersion(), resource.getResourceName()); assertNotNull(rightNestedTemplateDB); assertTrue(catalogDB.getNestedHeatTemplate(vfModuleDB.getTemplateId(), rightNestedTemplateDB.getId()) != null || catalogDB.getNestedHeatTemplate(vfModuleDB.getVolTemplateId(), rightNestedTemplateDB.getId()) != null); - + assertTrue(rightNestedTemplateDB.getAsdcResourceName().equals(resource.getResourceName())); assertTrue(rightNestedTemplateDB.getAsdcUuid().equals(artifact.getArtifactUUID())); assertTrue(rightNestedTemplateDB.getDescription().equals(artifact.getArtifactDescription())); assertTrue(rightNestedTemplateDB.getTemplateBody() != null && !rightNestedTemplateDB.getTemplateBody().isEmpty()); assertTrue(rightNestedTemplateDB.getTemplateName().equals(artifact.getArtifactName())); - + if (artifact.getArtifactTimeout() != null) { assertTrue(rightNestedTemplateDB.getTimeoutMinutes()== artifact.getArtifactTimeout().intValue()); } else { @@ -321,18 +323,18 @@ public class ASDCITCase { } assertTrue(rightNestedTemplateDB.getVersion().equals(artifact.getArtifactVersion())); assertFalse(rightNestedTemplateDB.getTemplateBody().contains("file:///")); - + break; case ASDCConfiguration.HEAT_VOL: HeatTemplate heatTemplateVolDB = catalogDB.getHeatTemplate(vfModuleDB.getVolTemplateId()); assertNotNull(heatTemplateVolDB); - + assertTrue(heatTemplateVolDB.getAsdcResourceName().equals(resource.getResourceName())); assertTrue(heatTemplateVolDB.getAsdcUuid().equals(artifact.getArtifactUUID())); assertTrue(heatTemplateVolDB.getDescription().equals(artifact.getArtifactDescription())); assertTrue(heatTemplateVolDB.getTemplateBody() != null && !heatTemplateVolDB.getTemplateBody().isEmpty()); assertTrue(heatTemplateVolDB.getTemplateName().equals(artifact.getArtifactName())); - + if (artifact.getArtifactTimeout() != null) { assertTrue(heatTemplateVolDB.getTimeoutMinutes()== artifact.getArtifactTimeout().intValue()); } else { @@ -340,32 +342,32 @@ public class ASDCITCase { } assertTrue(heatTemplateVolDB.getVersion().equals(artifact.getArtifactVersion())); assertFalse(heatTemplateVolDB.getTemplateBody().contains("file:///")); - + break; case ASDCConfiguration.HEAT_ARTIFACT: Map heatFilesDB= catalogDB.getHeatFilesForVfModule(vfModuleDB.getId()); assertTrue(heatFilesDB.size()>0); HeatFiles rightHeatFilesDB=heatFilesDB.get( artifact.getArtifactName()); assertNotNull(rightHeatFilesDB); - + assertTrue(rightHeatFilesDB.getAsdcResourceName().equals(resource.getResourceName())); assertTrue(rightHeatFilesDB.getAsdcUuid().equals(artifact.getArtifactUUID())); assertTrue(rightHeatFilesDB.getDescription().equals(artifact.getArtifactDescription())); assertTrue(rightHeatFilesDB.getFileBody() != null && !rightHeatFilesDB.getFileBody().isEmpty()); assertTrue(rightHeatFilesDB.getFileName().equals( artifact.getArtifactName())); assertTrue(rightHeatFilesDB.getVersion().equals(artifact.getArtifactVersion())); - + break; default: break; - + } } - + } - + } - + Service service = catalogDB.getServiceByUUID(inputNotification.getServiceUUID()); assertNotNull(service); assertTrue(service.getCreated() !=null && service.getCreated().getTime()>0); @@ -377,85 +379,85 @@ public class ASDCITCase { assertTrue(service.getVersion().equals(inputNotification.getServiceVersion())); } - + @Test @OperateOnDeployment("asdc-controller") public void testNotifsDeployment () throws NoSuchAlgorithmException, IOException, URISyntaxException, ArtifactInstallerException, ASDCControllerException, ASDCParametersException { - - - + + + ASDCController asdcControllerV1 = new ASDCController("asdc-controller1", distribClientV1); asdcControllerV1.initASDC(); asdcControllerV1.treatNotification(notifDataV1); - + assertTrue(distribClientV1.getDistributionMessageReceived().size() > 0); for (IDistributionStatusMessage message:distribClientV1.getDistributionMessageReceived()) { System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name()); assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK)); } - + this.validateVnfResource(notifDataV1,distribClientV1.getListVFModuleMetaData()); - - - + + + // Try again to load the same notif ASDCController asdcControllerNewNotif = new ASDCController("asdc-controller1", distribClientV1ForSameNotif); asdcControllerNewNotif.initASDC(); asdcControllerNewNotif.treatNotification(notifDataV1); - + for (IDistributionStatusMessage message:distribClientV1ForSameNotif.getDistributionMessageReceived()) { System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name()); assertTrue(message.getStatus().equals(DistributionStatusEnum.ALREADY_DEPLOYED) || message.getStatus().equals(DistributionStatusEnum.ALREADY_DOWNLOADED)); } - - + + // Try again to load same notif but in V2 ASDCController asdcControllerV2 = new ASDCController("asdc-controller1", distribClientV2); asdcControllerV2.initASDC(); asdcControllerV2.treatNotification(notifDataV2); - + for (IDistributionStatusMessage message:distribClientV2.getDistributionMessageReceived()) { System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name()); assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK)); } - + this.validateVnfResource(notifDataV2,distribClientV2.getListVFModuleMetaData()); - - + + // Try again to load same notif + Script + Volume artifacts and in service V3 ASDCController asdcControllerV3 = new ASDCController("asdc-controller1", distribClientV3); asdcControllerV3.initASDC(); asdcControllerV3.treatNotification(notifDataV3); - + for (IDistributionStatusMessage message:distribClientV3.getDistributionMessageReceived()) { System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name()); assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK)); } - + this.validateVnfResource(notifDataV3,distribClientV3.getListVFModuleMetaData()); - + // Try again to load same notif + Script + Volume artifacts and in service V4 ASDCController asdcControllerV4 = new ASDCController("asdc-controller1", distribClientV4); asdcControllerV4.initASDC(); asdcControllerV4.treatNotification(notifDataV4); - + for (IDistributionStatusMessage message:distribClientV4.getDistributionMessageReceived()) { System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name()); assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK)); } - + this.validateVnfResource(notifDataV4,distribClientV4.getListVFModuleMetaData()); - - - // Try again with service V5 (Nested template attached to Volume + HEat artifact not used by module), + + + // Try again with service V5 (Nested template attached to Volume + HEat artifact not used by module), //this should force the notification DEPLOY_ERROR to be sent for this artifact ASDCController asdcControllerV5 = new ASDCController("asdc-controller1", distribClientV5); asdcControllerV5.initASDC(); asdcControllerV5.treatNotification(notifDataV5); - + for (IDistributionStatusMessage message:distribClientV5.getDistributionMessageReceived()) { System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name()); if ("cloud-nimbus.sh".equals(message.getArtifactURL())) { @@ -464,22 +466,22 @@ public class ASDCITCase { assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK)); } } - + this.validateVnfResource(notifDataV5,distribClientV5.getListVFModuleMetaData()); - - + + // Try again with demo DNS ASDCController asdcControllerDNS = new ASDCController("asdc-controller1", distribClientDNS); asdcControllerDNS.initASDC(); asdcControllerDNS.treatNotification(notifDataDNS); - + for (IDistributionStatusMessage message:distribClientDNS.getDistributionMessageReceived()) { System.out.println("Message received, URL:"+message.getArtifactURL()+", Value:"+message.getStatus().name()); assertTrue(message.getStatus().equals(DistributionStatusEnum.DEPLOY_OK) || message.getStatus().equals(DistributionStatusEnum.DOWNLOAD_OK)); } - + this.validateVnfResource(notifDataDNS,distribClientDNS.getListVFModuleMetaData()); - + // Try again with demo VFW ASDCController asdcControllerVFW = new ASDCController("asdc-controller1", distribClientVFW); asdcControllerVFW.initASDC(); diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java index f2fabc09ce..54be7cdc90 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/DistributionClientEmulator.java @@ -16,6 +16,9 @@ import org.openecomp.sdc.api.consumer.IDistributionStatusMessage; import org.openecomp.sdc.api.consumer.INotificationCallback; import org.openecomp.sdc.api.notification.IArtifactInfo; import org.openecomp.sdc.api.notification.IVfModuleMetadata; +import org.openecomp.mso.asdc.installer.IVfModuleData; +import org.openecomp.mso.asdc.installer.VfModuleMetaData; +import org.openecomp.mso.asdc.client.ASDCConfiguration; import org.openecomp.sdc.api.results.IDistributionClientDownloadResult; import org.openecomp.sdc.api.results.IDistributionClientResult; import org.openecomp.sdc.impl.DistributionClientDownloadResultImpl; @@ -25,59 +28,51 @@ import org.openecomp.sdc.utils.DistributionActionResultEnum; public class DistributionClientEmulator implements IDistributionClient { private String resourcePath; - - private List listVFModuleMetaData; - + + private List listVFModuleMetaData; + private List distributionMessageReceived = new LinkedList<>(); - + public DistributionClientEmulator(String notifFolderInResource) { - + resourcePath = notifFolderInResource; } public List getDistributionMessageReceived() { return distributionMessageReceived; } - - @Override + @Deprecated public List decodeVfModuleArtifact(byte[] arg0) { - try { - listVFModuleMetaData = new ObjectMapper().readValue(arg0, new TypeReference>(){}); - return listVFModuleMetaData; - - } catch (JsonParseException e) { - e.printStackTrace(); - } catch (JsonMappingException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } + + return null; } - - public List getListVFModuleMetaData() { + + public List getListVFModuleMetaData() { return listVFModuleMetaData; } - @Override + @Override public IDistributionClientDownloadResult download (IArtifactInfo arg0) { - - + //String filename = resourcePath+"/artifacts/"+arg0.getArtifactURL(); String filename = arg0.getArtifactURL(); System.out.println("Emulating the download from resources files:"+filename); InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourcePath+"/artifacts/"+filename); - + if (inputStream == null) { System.out.println("InputStream is NULL for:"+filename); } try { - return new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, DistributionActionResultEnum.SUCCESS.name(),arg0.getArtifactName(),IOUtils.toByteArray(inputStream)); + byte[] bytes = IOUtils.toByteArray(inputStream); + if (arg0.getArtifactType().equals(ASDCConfiguration.VF_MODULES_METADATA)) { + listVFModuleMetaData = new ObjectMapper().readValue(bytes, new TypeReference>() { + }); + } + return new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, DistributionActionResultEnum.SUCCESS.name(),arg0.getArtifactName(),bytes); } catch (IOException e) { - - e.printStackTrace(); + return null; } - return null; } @Override @@ -122,7 +117,7 @@ public class DistributionClientEmulator implements IDistributionClient { @Override public IDistributionClientResult stop() { return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name()); - + } @Override diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java index e30bb5fcd0..79dcaed0c8 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/asdc/notif_emulator/JsonResourceInfo.java @@ -16,15 +16,15 @@ public class JsonResourceInfo implements IResourceInstance { @JsonIgnore private Map attributesMap = new HashMap<>(); - + @JsonProperty("artifacts") @JsonDeserialize(using=JsonArtifactInfoDeserializer.class) private List artifacts; - + public JsonResourceInfo() { - + } - + @Override public List getArtifacts() { return artifacts; @@ -59,7 +59,22 @@ public class JsonResourceInfo implements IResourceInstance { public String getResourceVersion() { return (String)attributesMap.get("resourceVersion"); } - + + @Override + public String getResourceCustomizationUUID() { + return (String)attributesMap.get("resourceCustomizationUUID"); + } + + @Override + public String getSubcategory() { + return (String)attributesMap.get("subCategory"); + } + + @Override + public String getCategory() { + return (String)attributesMap.get("category"); + } + @SuppressWarnings("unused") @JsonAnySetter public final void setAttribute(String attrName, Object attrValue) { diff --git a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java index 5783b237ed..abcb7d09a8 100644 --- a/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java +++ b/packages/arquillian-unit-tests/src/test/java/org/openecomp/mso/global_tests/soapui/SoapUiITCase.java @@ -86,11 +86,18 @@ public class SoapUiITCase { return warArchive; } - @Deployment(name="gammaBPMN",testable=false) - public static Archive createGammaBPMNDeployment () { - System.out.println("Deploying Gamma BPMN WAR on default server"); - return ArquillianPackagerForITCases.createPackageFromExistingOne("../../bpmn/MSOGammaBPMN/target/", "MSOGammaBPMN*.war", "MSOGammaBPMN.war"); + @Deployment(name="common-bpmn",testable=false) + public static Archive createCommonBPMNDeployment () { + System.out.println("Deploying Common BPMN WAR on default server"); + return ArquillianPackagerForITCases.createPackageFromExistingOne("../../bpmn/MSOCommonBPMN/target/", "MSOCommonBPMN*.war", "MSOCommonBPMN.war"); } + + @Deployment(name = "infrastructure-bpmn", testable = false) + public static Archive createInfraBPMNDeployment() { + System.out.println("Deploying Infrastructure BPMN WAR on default server"); + return ArquillianPackagerForITCases.createPackageFromExistingOne("../../bpmn/MSOInfrastructureBPMN/target/", + "MSOInfrastructureBPMN*.war", "MSOInfrastructureBPMN.war"); + } /* @Deployment(name = "SoapUIMocks", testable = false) public static Archive createSoapUIMocksWarDeployment () { diff --git a/packages/arquillian-unit-tests/src/test/resources/JMeter/MSO-Perf.jmx b/packages/arquillian-unit-tests/src/test/resources/JMeter/MSO-Perf.jmx index 4d7e95ca4f..5f9325838e 100644 --- a/packages/arquillian-unit-tests/src/test/resources/JMeter/MSO-Perf.jmx +++ b/packages/arquillian-unit-tests/src/test/resources/JMeter/MSO-Perf.jmx @@ -140,12 +140,12 @@ false - <service-request xmlns="http://ecomp.att.com/mso/request/layer3serviceactivate/schema/v1" xmlns:msolayer3="http://ecomp.att.com/mso/request/layer3/schema/v1" xmlns:msoservtypes="http://ecomp.att.com/mso/request/types/v1"> + <service-request xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1" xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"> <msoservtypes:request-information> <msoservtypes:request-id>test${REQUEST_ID}-service</msoservtypes:request-id> <msoservtypes:request-action>Layer3ServiceActivateRequest</msoservtypes:request-action> <msoservtypes:source>OMX</msoservtypes:source> -<msoservtypes:notification-url>https://csi-tst-q22.it.att.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url> +<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url> <msoservtypes:order-number>5051560</msoservtypes:order-number> <msoservtypes:order-version>1</msoservtypes:order-version> </msoservtypes:request-information> @@ -252,14 +252,14 @@ false <feature-request - xmlns="http://ecomp.att.com/mso/request/layer3serviceactivate/schema/v1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:msolayer3="http://ecomp.att.com/mso/request/layer3/schema/v1" - xmlns:msoservtypes="http://ecomp.att.com/mso/request/types/v1"> + xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1" + xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"> <msoservtypes:request-information> <msoservtypes:request-id>test${REQUEST_ID}-feature</msoservtypes:request-id> <msoservtypes:request-action>ChangeFeatureActivateRequest</msoservtypes:request-action> <msoservtypes:source>OMX</msoservtypes:source> - <msoservtypes:notification-url>https://csi-tst-q22.it.att.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url> + <msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url> <msoservtypes:order-number>5051560</msoservtypes:order-number> <msoservtypes:order-version>1</msoservtypes:order-version> </msoservtypes:request-information> @@ -495,12 +495,12 @@ false - <service-request xmlns="http://ecomp.att.com/mso/request/layer3serviceactivate/schema/v1" xmlns:msolayer3="http://ecomp.att.com/mso/request/layer3/schema/v1" xmlns:msoservtypes="http://ecomp.att.com/mso/request/types/v1"> + <service-request xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1" xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"> <msoservtypes:request-information> <msoservtypes:request-id>test${SERVICE_ID}-service</msoservtypes:request-id> <msoservtypes:request-action>Layer3ServiceActivateRequest</msoservtypes:request-action> <msoservtypes:source>OMX</msoservtypes:source> -<msoservtypes:notification-url>https://csi-tst-q22.it.att.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url> +<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url> <msoservtypes:order-number>5051560</msoservtypes:order-number> <msoservtypes:order-version>1</msoservtypes:order-version> </msoservtypes:request-information> @@ -693,12 +693,12 @@ false - <service-request xmlns="http://ecomp.att.com/mso/request/layer3serviceactivate/schema/v1" xmlns:msolayer3="http://ecomp.att.com/mso/request/layer3/schema/v1" xmlns:msoservtypes="http://ecomp.att.com/mso/request/types/v1"> + <service-request xmlns="http://org.openecomp/mso/request/layer3serviceactivate/schema/v1" xmlns:msolayer3="http://org.openecomp/mso/request/layer3/schema/v1" xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"> <msoservtypes:request-information> <msoservtypes:request-id>test${SERVICE_ID}-service</msoservtypes:request-id> <msoservtypes:request-action>Layer3ServiceActivateRequest</msoservtypes:request-action> <msoservtypes:source>OMX</msoservtypes:source> -<msoservtypes:notification-url>https://csi-tst-q22.it.att.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url> +<msoservtypes:notification-url>https://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</msoservtypes:notification-url> <msoservtypes:order-number>5051560</msoservtypes:order-number> <msoservtypes:order-version>1</msoservtypes:order-version> </msoservtypes:request-information> diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml index 4629cd8173..19b3c5144d 100644 --- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml +++ b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml @@ -1,114 +1,114 @@ -http://localhost:8080enabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 404htmltext/plain200dataapplication/jsontext/plain500datatext/html200html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401htmltext/plain200dataapplication/jsontext/plain500data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 403htmltext/plain200dataapplication/json0data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 403htmltext/plain200dataapplication/json0datatext/plain500data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 403htmltext/plain200dataapplication/jsontext/plain500data0data<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNamehttp://localhost:8080enableBpmnQUERY0datatext/html200htmltext/html503html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheckNo AuthorizationenableBpmnenableBpmnQUERY0data0data0datatext/html503htmltext/html200html<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheckNo AuthorizationenableBpmnhttp://${#Project#jrahost}text/html200htmltext/html503html0data0data0data0datatext/html;charset=utf-8500html<xml-fragment/>http://${#Project#jrahost}http://localhost/networks/admin/healthcheckNo Authorizationtext/html200htmltext/html503html<xml-fragment/>truehttp://${#Project#jrahost}http://localhost/adapters/rest/healthcheckNo Authorizationtext/html200htmltext/html503html0datatext/html;charset=utf-8500 404html<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/rest/healthcheckNo Authorization0data0datatext/html200htmltext/html503html<xml-fragment/>http://${#Project#jrahost}http://localhost/tenants/admin/healthcheckNo Authorizationtext/html200htmltext/html503html0datatext/html;charset=utf-8404html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/healthcheckNo Authorizationtext/html200htmltext/html503html0data<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheckNo Authorizationnot used in Arquilian as not same repoapplication/jsonapplication/json500 503heal:Faulttext/html;charset=utf-8400 404 405htmlapplication/json200heal:Response0data0data0datatext/html200html<xml-fragment/>http://${#Project#bpmnhost}{"variables":{}}localhost/mso/async/services/HealthCheckNo Authorizationtext/html200htmltext/html503html0data0data0data0data200data200data200data200data0data0data0data0data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/healthcheckNo Authorizationnot used in Arquilian as not same repoapplication/jsonapplication/json500 503heal:Faulttext/html;charset=utf-8400 404htmlapplication/json200heal:Response0data0data0data<xml-fragment/>http://${#Project#bpmnhost}{"variables":{"requestId":{"value":"test","type":"String"}}}localhost/mso/async/services/HealthCheckNo Authorizationhttp://192.168.126.130:8080text/xml;charset=ISO-8859-1200soapenv:Envelopeapplication/xmlsoapenv:Envelopetext/xml;charset=ISO-8859-1500soapenv:Envelopetext/html;charset=utf-8404html<xml-fragment/>http://${#Project#apihhost} +http://localhost:8080enabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 404htmltext/plain200dataapplication/jsontext/plain500datatext/html200html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401htmltext/plain200dataapplication/jsontext/plain500data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 403htmltext/plain200dataapplication/json0data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 403htmltext/plain200dataapplication/json0datatext/plain500data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 403htmltext/plain200dataapplication/jsontext/plain500data0data<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNamehttp://localhost:8080enableBpmnQUERY0datatext/html200htmltext/html503html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheckNo AuthorizationenableBpmnenableBpmnQUERY0data0data0datatext/html503htmltext/html200html<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheckNo AuthorizationenableBpmnhttp://${#Project#jrahost}text/html200htmltext/html503html0data0data0data0datatext/html;charset=utf-8500html<xml-fragment/>http://${#Project#jrahost}http://localhost/networks/admin/healthcheckNo Authorizationtext/html200htmltext/html503html<xml-fragment/>truehttp://${#Project#jrahost}http://localhost/adapters/rest/healthcheckNo Authorizationtext/html200htmltext/html503html0datatext/html;charset=utf-8500 404html<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/rest/healthcheckNo Authorization0data0datatext/html200htmltext/html503html<xml-fragment/>http://${#Project#jrahost}http://localhost/tenants/admin/healthcheckNo Authorizationtext/html200htmltext/html503html0datatext/html;charset=utf-8404html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/healthcheckNo Authorizationtext/html200htmltext/html503html0data<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheckNo Authorizationnot used in Arquilian as not same repoapplication/jsonapplication/json500 503heal:Faulttext/html;charset=utf-8400 404 405htmlapplication/json200heal:Response0data0data0datatext/html200htmltext/html404html<xml-fragment/>http://${#Project#bpmnhost}{"variables":{}}localhost/mso/async/services/HealthCheckNo Authorizationtext/html200htmltext/html503html0data0data0data0data200data200data200data200data0data0data0data0data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/healthcheckNo Authorizationnot used in Arquilian as not same repoapplication/jsonapplication/json500 503heal:Faulttext/html;charset=utf-8400 404htmlapplication/json200heal:Response0data0data0data<xml-fragment/>http://${#Project#bpmnhost}{"variables":{"requestId":{"value":"test","type":"String"}}}localhost/mso/async/services/HealthCheckNo Authorizationtext/html200htmlhttp://${#Project#jrahost}No Authorizationhttp://192.168.126.130:8080text/xml;charset=ISO-8859-1200soapenv:Envelopeapplication/xmlsoapenv:Envelopetext/xml;charset=ISO-8859-1500soapenv:Envelopetext/html;charset=utf-8404html<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapterNo Authorizationhttp://localhost:8080text/html200html<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheckNo Authorizationtext/html200htmltext/html;charset=utf-8401htmltext/html503html<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheckNo AuthorizationSEQUENTIAL<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapterNo Authorizationhttp://localhost:8080text/html200html<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheckNo Authorizationtext/html200htmltext/html;charset=utf-8401htmltext/html503html<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheckNo Authorization0datatext/html200htmlhttp://localhost:8080No AuthorizationSEQUENTIAL<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheck200No AuthorizationenableBpmn<xml-fragment/>http://${#Project#jrahost}http://localhost/networks/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/healthcheck200No Authorization<xml-fragment/>http://${#Project#bpmnhost}{"variables":{}}localhost/mso/async/services/HealthCheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>UTF-8http://${#Project#jrahost}http://http//$%7B200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheck200No AuthorizationenableBpmn<xml-fragment/>http://${#Project#jrahost}http://localhost/networks/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/healthcheck200No Authorization<xml-fragment/>http://${#Project#bpmnhost}{"variables":{}}localhost/mso/async/services/HealthCheck200No Authorization<xml-fragment/>UTF-8http://${#Project#jrahost}http://localhost/mso/common/healthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheck200No AuthorizationenableBpmn<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck200No AuthorizationenableBpmn<xml-fragment/>http://${#Project#jrahost}http://localhost/networks/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/healthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/tenants/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteName<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheck503No Authorization<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheck200No AuthorizationenableBpmn<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck200No AuthorizationenableBpmn<xml-fragment/>http://${#Project#jrahost}http://localhost/networks/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/healthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/tenants/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteName<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheck503No Authorization<xml-fragment/>UTF-8http://${#Project#jrahost}http://http//$%7B503No Authorization<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheck503No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck503No AuthorizationenableBpmn<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheck503No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck503No AuthorizationenableBpmn<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#bpmnhost}{"variables":{}}localhost/mso/async/services/HealthCheck503No Authorization<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#bpmnhost}{"variables":{}}localhost/mso/async/services/HealthCheck503No Authorization<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalseNo Authorizationhttp://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck503No AuthorizationenableBpmnhttp://${#Project#jrahost}http://localhost/networks/admin/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/admin/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/tenants/admin/healthcheck503No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/healthcheck503No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapter<return>false</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settingshttp://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck503No AuthorizationenableBpmnhttp://${#Project#jrahost}http://localhost/networks/admin/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/admin/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/tenants/admin/healthcheck503No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/healthcheck503No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheck503No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus200${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteName<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalseNo Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck200No AuthorizationenableBpmnhttp://${#Project#jrahost}http://localhost/tenants/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheck200No Authorizationapihhostlocalhost:8080jrahostlocalhost:8080userloginsitecontroluserpasswordDomain2.0!bpmnhostlocalhost:8080sitenamemso-dockerenableBpmn \ No newline at end of file +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck200No AuthorizationenableBpmnhttp://${#Project#jrahost}http://localhost/tenants/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheck200No Authorizationapihhostlocalhost:8080jrahostlocalhost:8080userloginsitecontroluserpasswordDomain2.0!bpmnhostlocalhost:8080sitenamemso-dockerenableBpmndbadapteruserBPELClientdbadapterpasswordpassword1$ \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml index 80ac36c8af..49887308b9 100755 --- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml +++ b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml @@ -1,5 +1,5 @@ -http://localhost:8080application/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502 409v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host} +http://localhost:8080application/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502 409v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host} 155415ab-b4a7-4382-b4c6-d17d950565 Layer3ServiceActivateRequest @@ -67,10 +67,10 @@ ]]>http://localhost/ecomp/mso/v1/services${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host} @@ -120,7 +120,7 @@ ification.jws 48 - + Y Y @@ -130,14 +130,14 @@ ification.jws 10.192.70.252 - + Y 2620:0:10d0:0:ffff:ffff:ffff:fffe 64 2620:0:10d0:0:ffff:ffff:ffff:fffd - + Y @@ -174,10 +174,10 @@ ification.jws - ]]>http://localhost/ecomp/mso/v1/services/${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host} + ]]>http://localhost/ecomp/mso/v1/services/${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host} 155415ab-b4a7-4382-b4c6-d17d950565 FeatureChangeActivateRequest @@ -197,16 +197,16 @@ ification.jws ST E2E Test50565_13000050565 -]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-gui}${#Project#password-gui}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/v1/services/feature${#Project#user-gui}${#Project#password-gui}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host} requestid12392 - ChangeFeatureActivateRequest + ChangeFeatureActivateRequest OMX http://localhost:9096/CSINotify 123123 @@ -215,7 +215,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SDN-ETHERNET-INTERNET AS/VLXM/000212//SB_INTERNET - StevesPizzaPlace15 + StevesPizzaPlace15 FIREWALL-LITE @@ -230,10 +230,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-gui}${#Project#password-gui}BasicBasicGlobal HTTP Settingsrequest-idTEMPLATEapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data*/*200v1:query-response<xml-fragment/>http://${#Project#host} +]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-gui}${#Project#password-gui}BasicBasicGlobal HTTP Settingsrequest-idTEMPLATEapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data*/*200v1:query-response<xml-fragment/>http://${#Project#host} 155415ab-b4a7-4382-b4c6-d17d950565 FeatureChangeActivateRequest @@ -253,10 +253,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ST E2E Test50565_13000050565 -]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsrequest-idfeature-instance-idTEMPLATEapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data*/*200v1:query-responses<xml-fragment/>http://${#Project#host} +]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsrequest-idfeature-instance-idTEMPLATEapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data*/*200v1:query-responses<xml-fragment/>http://${#Project#host} 155415ab-b4a7-4382-b4c6-d17d950565 FeatureChangeActivateRequest @@ -276,10 +276,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ST E2E Test50565_13000050565 -]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-gui}${#Project#password-gui}BasicBasicGlobal HTTP Settingsfeature-instance-idservice-instance-idTEMPLATEapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data400data*/*200v1:query-responses<xml-fragment/>http://${#Project#host} +]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-gui}${#Project#password-gui}BasicBasicGlobal HTTP Settingsfeature-instance-idservice-instance-idTEMPLATEapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data400data*/*200v1:query-responses<xml-fragment/>http://${#Project#host} 155415ab-b4a7-4382-b4c6-d17d950565 FeatureChangeActivateRequest @@ -299,10 +299,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ST E2E Test50565_13000050565 -]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsservice-instance-idservice-instance-idQUERYfeature-instance-idQUERYapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data*/*200v1:query-responses<xml-fragment/>http://${#Project#host} +]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsservice-instance-idservice-instance-idQUERYfeature-instance-idQUERYapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data*/*200v1:query-responses<xml-fragment/>http://${#Project#host} 155415ab-b4a7-4382-b4c6-d17d950565 FeatureChangeActivateRequest @@ -322,8 +322,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ST E2E Test50565_13000050565 -]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-gui}${#Project#password-gui}BasicBasicGlobal HTTP Settingsservice-instance-idfeature-instance-idapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host} - +]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-gui}${#Project#password-gui}BasicBasicGlobal HTTP Settingsservice-instance-idfeature-instance-idapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host} + tns:request-id GetAicNodesRequest @@ -343,8 +343,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 0 Mbps -]]>http://localhost/ecomp/mso/v1/services${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502 409v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host}]]>http://localhost/ecomp/mso/v1/services${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502 409v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host} 3d878a8e-51fa-44aa-8cb5-a56ae9352252 @@ -358,9 +358,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" AUSTXAALCP1 276b95b6d2b04e2e830c976eb70c9405 - + -]]>http://localhost/ecomp/mso/v1/services${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsvnf-typeQUERYservice-typeQUERYaic-node-clliQUERYtenant-idQUERYvolume-group-idQUERYvolume-group-nameQUERY*/*200v1:vnf-requeststext/html;charset=utf-8405htmlhttp://localhost:8080No Authorizationvnf-typeservice-typeaic-node-cllitenant-idvolume-group-idvolume-group-namevnf-roleQUERYtext/html;charset=utf-8401 403 404 500html*/*200v1:vnf-types<xml-fragment/>http://${#Project#host}http://135.21.125.49/ecomp/mso/infra/V1/vnf-types${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsvnf-rolenetwork-typeQUERYtenant-idQUERYservice-typeQUERYaic-node-clliQUERYtext/html;charset=utf-8401 403 404 500html*/*200v1:vnf-types<xml-fragment/>http://${#Project#host}http://135.21.125.49/ecomp/mso/infra/V1/vnf-types${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsnetwork-typetenant-idservice-typeaic-node-clliapplication/xml400 500 409v1:network-requestapplication/json0data0dataapplication/xmlv1:network-requestapplication/xml202v1:network-request<xml-fragment/>http://localhost:8080 +]]>http://localhost/ecomp/mso/v1/services${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsvnf-typeQUERYservice-typeQUERYaic-node-clliQUERYtenant-idQUERYvolume-group-idQUERYvolume-group-nameQUERY*/*200v1:vnf-requeststext/html;charset=utf-8405htmlhttp://localhost:8080No Authorizationvnf-typeservice-typeaic-node-cllitenant-idvolume-group-idvolume-group-namevnf-roleQUERYtext/html;charset=utf-8401 403 404 500html*/*200v1:vnf-types<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/infra/V1/vnf-types${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsvnf-rolenetwork-typeQUERYtenant-idQUERYservice-typeQUERYaic-node-clliQUERYtext/html;charset=utf-8401 403 404 500html*/*200v1:vnf-types<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/infra/V1/vnf-types${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsnetwork-typetenant-idservice-typeaic-node-clliapplication/xml400 500 409v1:network-requestapplication/json0data0dataapplication/xmlv1:network-requestapplication/xml202v1:network-request<xml-fragment/>http://localhost:8080 CREATE init-status-string 1 @@ -385,8 +385,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 0 -]]>No Authorizationtext/html;charset=utf-8401 403 404 500html*/*200v1:vnf-types<xml-fragment/>http://${#Project#host}http://135.21.125.49/ecomp/mso/infra/V1/vnf-types${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsrequest-idTEMPLATE*/*200v1:network-request<xml-fragment/>http://localhost:8080No Authorizationrequest-idTEMPLATE*/*200v1:vnf-requesttext/html;charset=utf-8404 400htmlapplication/octet-stream200v1:vnf-requesthttp://localhost:8080No AuthorizationtenantIdQUERYvnf-typeQUERY*/*200v1:network-requestapplication/jsonv1:volume-requesttext/html;charset=utf-8401 403htmlapplication/xmlv1:volume-requestapplication/xml400 501v1:volume-requestapplication/xml202v1:volume-request<xml-fragment/>http://localhost:8080 - +]]>No Authorizationtext/html;charset=utf-8401 403 404 500html*/*200v1:vnf-types<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/infra/V1/vnf-types${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsrequest-idTEMPLATE*/*200v1:network-request<xml-fragment/>http://localhost:8080No Authorizationrequest-idTEMPLATE*/*200v1:vnf-requesttext/html;charset=utf-8404 400htmlapplication/octet-stream200v1:vnf-requesthttp://localhost:8080No AuthorizationtenantIdQUERYvnf-typeQUERY*/*200v1:network-requestapplication/jsonv1:volume-requesttext/html;charset=utf-8401 403htmlapplication/xmlv1:volume-requestapplication/xml400 501v1:volume-requestapplication/xml202v1:volume-request<xml-fragment/>http://localhost:8080 + cfbca420-14d5-4e68-ad84-b56715c946f4 DELETE_VF_MODULE_VOL @@ -402,7 +402,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" da9e0bdf-7d88-4111-bcad-8b72e3a5e601 -]]>${#Project#user-csi}${#Project#user-csi}BasicBasicGlobal HTTP Settingstext/html;charset=utf-8404 405html*/*200v1:volume-requestshttp://localhost:8080No AuthorizationtenantIdvnf-typeapplication/jsonapplication/json400 409v2:Faultapplication/json202v2:Response0datatext/html;charset=UTF-8401html0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host}{ +]]>${#Project#user-csi}${#Project#user-csi}BasicBasicGlobal HTTP Settingstext/html;charset=utf-8404 405html*/*200v1:volume-requestshttp://localhost:8080No AuthorizationtenantIdvnf-typeapplication/jsonapplication/json400 409 500v2:Faultapplication/json202v2:Response0datatext/html;charset=UTF-8401html0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host}{ "requestDetails": { "modelInfo": { "modelType": "service", @@ -426,11 +426,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "name": "someUserParam", "value": "someValue" - } + } ] } } -}http://localhost/ecomp/mso/infra/serviceInstances/v2${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdTEMPLATEvnfInstanceIdTEMPLATEapplication/jsontext/html;charset=UTF-8401htmlapplication/json400 404 409vfm:Faultapplication/json202vfm:Response0data0data<xml-fragment/>http://${#Project#host}{ "requestDetails": { +}http://localhost/ecomp/mso/infra/serviceInstances/v2${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdTEMPLATEvnfInstanceIdTEMPLATEapplication/jsontext/html;charset=UTF-8401htmlapplication/json400 404 409vfm:Faultapplication/json202vfm:Response0data0data0data<xml-fragment/>http://${#Project#host}{ "requestDetails": { "modelInfo": { "modelType": "vfModule", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132", @@ -451,7 +451,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111", "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", @@ -460,7 +460,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } - + ], @@ -469,7 +469,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } -${#Project#user-infraportal}${#Project#user-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdvnfInstanceIdserviceInstanceIdserviceInstanceIdTEMPLATEserviceInstanceIdapplication/json502 400vnfs:Faultapplication/jsonapplication/json202vnfs:Response<xml-fragment/>http://${#Project#host}{ +${#Project#user-infraportal}${#Project#user-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdvnfInstanceIdserviceInstanceIdserviceInstanceIdTEMPLATEserviceInstanceIdapplication/json502 400 404vnfs:Faultapplication/jsonapplication/json202vnfs:Response0data0data<xml-fragment/>http://${#Project#host}{ "requestDetails": { "modelInfo": { "modelType": "vnf", @@ -493,7 +493,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "${serviceInstanceId}", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", @@ -531,7 +531,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "name": "someUserParam", "value": "someValue" - } + } ] } } @@ -556,7 +556,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111", "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", @@ -565,7 +565,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } - + ], @@ -595,7 +595,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111", "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", @@ -604,7 +604,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } - + ], @@ -637,7 +637,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "${serviceInstanceId}", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", @@ -672,7 +672,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111", "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", @@ -681,7 +681,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } - + ], @@ -711,7 +711,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111", "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", @@ -720,7 +720,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } - + ], @@ -750,7 +750,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "9f3e7072-4cf2-4536-addb-7eed2fef8f39", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111", "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", @@ -759,7 +759,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } - + ], @@ -768,7 +768,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } -${#Project#user-infraportal}${#Project#user-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdvnfInstanceIdvolumeGroupInstanceIdserviceInstanceIdserviceInstanceIdTEMPLATEserviceInstanceIdapplication/json502 400 404vnfs:Faultapplication/jsonapplication/json202vnfs:Responsetext/html;charset=UTF-8401html415dataapplication/xmlv1:network-request0data<xml-fragment/>http://${#Project#host}{ +${#Project#user-infraportal}${#Project#user-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdvnfInstanceIdvolumeGroupInstanceIdserviceInstanceIdserviceInstanceIdTEMPLATEserviceInstanceIdapplication/json502 400 404vnfs:Faultapplication/jsonapplication/json202vnfs:Responsetext/html;charset=UTF-8401html415dataapplication/xmlv1:network-request0data<xml-fragment/>http://${#Project#host}{ "requestDetails": { "modelInfo": { "modelType": "vnf", @@ -792,7 +792,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "${serviceInstanceId}", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", @@ -830,7 +830,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "${serviceInstanceId}", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", @@ -868,7 +868,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "relatedInstance": { "instanceId": "${serviceInstanceId}", - "modelInfo": { + "modelInfo": { "modelType": "service", "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", @@ -882,10 +882,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } -${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdnetworkInstanceIdrequestIdrequestIdTEMPLATErequestIdtext/html;charset=UTF-8401htmlapplication/json200d28:Response204data204data204datahttp://localhost:8080No AuthorizationfilterQUERY0datatext/html404htmltext/html;charset=UTF-8401htmlapplication/json200v2:Response0data<xml-fragment/>http://localhost:8080http://localhost/orchestrationRequests/v2No Authorizationfilterfile:/RequestsDbAdapter.wsdl - +${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdnetworkInstanceIdrequestIdrequestIdTEMPLATErequestIdtext/html;charset=UTF-8401htmlapplication/json200d28:Response204data204data204datahttp://localhost:8080No AuthorizationfilterQUERY0datatext/html404htmltext/html;charset=UTF-8401htmlapplication/json200v2:Response0data<xml-fragment/>http://localhost:8080http://localhost/orchestrationRequests/v2No Authorizationfilterfile:/RequestsDbAdapter.wsdl + - + @@ -1019,18 +1019,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - - - + + + - - - + + + - - + + @@ -1074,14 +1074,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URLUTF-8REPLACE_WITH_ACTUAL_URL\r +]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URLUTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r ?\r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -1099,15 +1099,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ?\r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL +]]>UTF-8REPLACE_WITH_ACTUAL_URL ? -]]>SEQUENTIAL<xml-fragment/>http://${#Project#host} - +]]>SEQUENTIAL<xml-fragment/>http://${#Project#host} + 3d878a8e-51fa-44aa-8cb5-a56ae9352262 CREATE_VF_MODUL @@ -1130,7 +1130,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ]]>http://localhost/ecomp/mso/v1/services400 No valid actionfalsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host} - + 3d878a8e-51fa-44aa-8cb5-a56ae9352262 CREATE_VF_MODULE @@ -1152,7 +1152,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ]]>http://localhost/ecomp/mso/v1/services202 <request-status>IN_PROGRESS</request-status>falsefalse<vnf-name>zrdm3ssdr02</vnf-name>falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsrequest-idResponsePOST VNF request//*:request-idrequest-idGET VNF Request by requestIDtrue<xml-fragment/>http://${#Project#host} - + 3d878a8e-51fa-44aa-8cb5-a56ae9352262 CREATE_VF_MODULE @@ -1174,27 +1174,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ]]>http://localhost/ecomp/mso/v1/services409 <request-status>FAILED</request-status>falsefalsevnf-id (f7949288-876d-47c2-9a8c-aed107e7e016) is lockedfalsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host} - + 3d878a8e-51fa-44aa-8cb5-a56ae9352263 CREATE_VF_MODULE PORTAL - + zrdm3ssdr02 Nimbus_LU2_SSDnoLM_Svc/SSDR_wo_LM_v10 2 SSDR_wo_LM_v10::module-0 a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb - + rdm3 eecd15e8e7ee46c3bbc2096f0924f4c4 ]]>http://localhost/ecomp/mso/v1/services400 <request-status>FAILED</request-status>falsefalse<status-message>Service request FAILED schema validation.falsefalseNo valid vf-module-name isfalsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host} - + 3d878a8e-51fa-44aa-8cb5-a56ae9352263 DELETE_VF_MODULE @@ -1216,9 +1216,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ]]>http://localhost/ecomp/mso/v1/services202<request-status>IN_PROGRESS</request-status>falsefalse<vnf-name>zrdm3ssdr02</vnf-name>falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/infra/v1/vnf-request/01bef4ef-fa1b-4fd4-b46d-12ada0d4d7e1 <request-status>IN_PROGRESS</request-status>falsefalse200${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings -vnf-typeservice-typeaic-node-cllitenantId<xml-fragment/>http://${#Project#host}http://135.21.125.49/ecomp/mso/infra/V1/vnf-types200 -<vnf-types xmlns="http://ecomp.att.com/mso/infra/vnf-request/v1"/>falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsvnf-role<xml-fragment/>http://${#Project#host} - +vnf-typeservice-typeaic-node-cllitenantId<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/infra/V1/vnf-types200 +<vnf-types xmlns="http://org.openecomp/mso/infra/vnf-request/v1"/>falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsvnf-role<xml-fragment/>http://${#Project#host} + f9d87288-b726-4b23-a207-8eb845a7b8d9 CREATE @@ -1236,7 +1236,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ]]>http://localhost/ecomp/mso/infra/v1/network-requestIN_PROGRESSfalsefalse202 <network-name>Mobisupport-25193-T-Willows2_cor_pcrf_sy_net_1</network-name>falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host} - + f9d87288-b726-4b23-a207-8eb845a7b8d9 CREATE @@ -1252,14 +1252,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" e5225256ffcc4e22928a432f2bcee195 -]]>http://localhost/ecomp/mso/infra/v1/network-requestIN_PROGRESSfalsefalse409<network-name>Mobisupport-25193-T-Willows2_cor_pcrf_sy_net_1</network-name>falsefalseis lockedfalsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsrequest-idResponsePOST Network Request CREATE//*:request-idrequest-idGET NEtwork Request by request IDtrue<xml-fragment/>http://${#Project#host}http://135.21.125.49/ecomp/mso/infra/V1/vnf-typese5225256ffcc4e22928a432f2bcee195falsefalse200 -${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsnetwork-typetenant-idservice-typeaic-node-clli<xml-fragment/>http://${#Project#host}http://135.21.125.49/ecomp/mso/infra/V1/vnf-typesMobisupport-25193-T-Willows2_cor_pcrf_sy_net_1falsefalse200 +]]>http://localhost/ecomp/mso/infra/v1/network-requestIN_PROGRESSfalsefalse409<network-name>Mobisupport-25193-T-Willows2_cor_pcrf_sy_net_1</network-name>falsefalseis lockedfalsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsrequest-idResponsePOST Network Request CREATE//*:request-idrequest-idGET NEtwork Request by request IDtrue<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/infra/V1/vnf-typese5225256ffcc4e22928a432f2bcee195falsefalse200 +${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsnetwork-typetenant-idservice-typeaic-node-clli<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/infra/V1/vnf-typesMobisupport-25193-T-Willows2_cor_pcrf_sy_net_1falsefalse200 ${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings -network-typetenantIdservice-typeaic-node-clli<xml-fragment/>http://${#Project#host}http://135.21.125.49/ecomp/mso/infra/V1/vnf-types200vlanfalsefalse <description>Cool network</description> +network-typetenantIdservice-typeaic-node-clli<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/infra/V1/vnf-types200vlanfalsefalse <description>Cool network</description> falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host} - + cfbca420-14d5-4e68-ad84-b56715c946f4 CREATE_VF_MODULE_VOL @@ -1305,12 +1305,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "name": "someUserParam", "value": "someValue" - } + } ] } } }http://localhost/ecomp/mso/infra/serviceInstances/v2202 -${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingstransfer-to-create-vnf-requestResponseCreate Service$.requestReferences.instanceIdRequestCreate VNF$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-create-vfmodule-requestResponseCreate Service$.requestReferences.instanceIdRequestCreate VFModule$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-create-volumegroups-requestResponseCreate Service$.requestReferences.instanceIdRequestCreate VolumeGroups$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtrueset-testcase-serviceInstanceId-propertyResponseCreate Service$.requestReferences.instanceIdserviceInstanceId#TestCase#JSONPATHXPATHtruetransfer-to-create-network-requestResponseCreate Service$.requestReferences.instanceIdRequestCreate Networks$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-vfmodule-requestResponseCreate Service$.requestReferences.instanceIdRequestUpdate VFModule$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-volumeGroups-requestResponseCreate Service$.requestReferences.instanceIdRequestUpdate VolumeGroups$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-network-requestResponseCreate Service$.requestReferences.instanceIdRequestUpdaate Networks$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtrueset-testcase-requestId-propertyResponseCreate Service$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingstransfer-to-create-vnf-requestResponseCreate Service$.requestReferences.instanceIdRequestCreate VNF$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-create-vfmodule-requestResponseCreate Service$.requestReferences.instanceIdRequestCreate VFModule$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-create-volumegroups-requestResponseCreate Service$.requestReferences.instanceIdRequestCreate VolumeGroups$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtrueset-testcase-serviceInstanceId-propertyResponseCreate Service$.requestReferences.instanceIdserviceInstanceId#TestCase#JSONPATHXPATHtruetransfer-to-create-network-requestResponseCreate Service$.requestReferences.instanceIdRequestCreate Networks$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-vfmodule-requestResponseCreate Service$.requestReferences.instanceIdRequestUpdate VFModule$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-volumeGroups-requestResponseCreate Service$.requestReferences.instanceIdRequestUpdate VolumeGroups$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-network-requestResponseCreate Service$.requestReferences.instanceIdRequestUpdaate Networks$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtrueset-testcase-requestId-propertyResponseCreate Service$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1320,7 +1320,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a200"requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0"},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DNS_TEST","suppressRollback":true},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"subscriber-1","subscriberName":"testSubscriber"},"cloudConfiguration":null,"requestParameters":{"subscriptionServiceType":"MOG","userParams":[{"name":"someUserParam","value":"someValue"}]}},"instanceReferences":{"serviceInstanceId":"falsefalse"serviceInstanceName":"DNS_TEST","vnfInstanceId":null,"vnfInstanceName":null,"vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null},"requestStatus":{"requestState":falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a204${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host}{"requestDetails": { +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a200"requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":null,"modelCustomizationId":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DNS_TEST","suppressRollback":true,"requestorId":null},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"subscriber-1","subscriberName":"testSubscriber"},"cloudConfiguration":null,"requestParameters":{"subscriptionServiceType":"MOG","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":falsefalsefalse"serviceInstanceName":"DNS_TEST","vnfInstanceId":null,"vnfInstanceName":null,"vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null,"requestorId":null},"requestStatus":{"requestState":falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a204${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host}{"requestDetails": { + "cloudConfiguration": { + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "lcpCloudRegionId": "mdt1" + }, "modelInfo": { "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", "modelName": "DNSResource", @@ -1329,10 +1333,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelCustomizationName": "DNSResource-1", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112" }, - "cloudConfiguration": { - "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "lcpCloudRegionId": "mdt1" - }, "relatedInstanceList": [{"relatedInstance": { "modelInfo": { "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", @@ -1341,16 +1341,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff" }, - "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" + "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82" }}], "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "source": "VID", "suppressRollback": false, + "source": "VID", "instanceName": "DNSTEST1" }, "requestParameters": {} -}}http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/202${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}http://localhost/orchestrationRequests/v2200"requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0"},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DNS_TEST","suppressRollback":true},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"subscriber-1","subscriberName":"testSubscriber"},"cloudConfiguration":null,"requestParameters":{"subscriptionServiceType":"MOG","userParams":[{"name":"someUserParam","value":"someValue"}]}},"instanceReferences":{"serviceInstanceId":"falsefalse"serviceInstanceName":"DNS_TEST","vnfInstanceId":null,"vnfInstanceName":null,"vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null},"requestStatus":{"requestState":"falsefalse$.requestList2falsefalsefalse"requestScope":"vnf","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":"DNSResource-1","modelInvariantId":"585822c7-4027-4f84-ba50-e9248606f112","modelType":"vnf","modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe","modelName":"DNSResource","modelVersion":"1.0"},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","orderVersion":null,"source":"VID","instanceName":"DNSTEST1","suppressRollback":false},"relatedInstanceList":[{"relatedInstance":{"instanceName":null,"instanceId":"falsefalse"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0"}}}],"subscriberInfo":null,"cloudConfiguration":{"aicNodeClli":null,"tenantId":"88a6ca3ee0394ade9403f075db23167e","lcpCloudRegionId":"mdt1"},"requestParameters":{"subscriptionServiceType":null,"userParams":[]}},"instanceReferences":{"serviceInstanceId":"falsefalse"serviceInstanceName":null,"vnfInstanceId":null,"vnfInstanceName":"DNSTEST1","vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null},"requestStatus":{"requestState":"falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsfiltertransfer-to-create-vfmodule-requestResponseCreate VNF$.requestReferences.instanceIdRequestCreate VFModule$.requestDetails.relatedInstanceList[1].relatedInstance.instanceIdJSONPATHJSONPATHtrueset-testcase-requestId-propertyResponseCreate VNF$.requestReferences.requestIdrequestId#TestCase#JSONPATHXPATHtrueset-testcase-vnfInstanceId-propertyResponseCreate VNF$.requestReferences.instanceIdvnfInstanceId#TestCase#JSONPATHXPATHtruetransfer-to-create-volumegroups-requestResponseCreate VNF$.requestReferences.instanceIdRequestCreate VolumeGroups$.requestDetails.relatedInstanceList[1].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-volumegroups-requestResponseCreate VNF$.requestReferences.instanceIdRequestUpdate VolumeGroups$.requestDetails.relatedInstanceList[1].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-vfmodule-requestResponseCreate VNF$.requestReferences.instanceIdRequestUpdate VFModule$.requestDetails.relatedInstanceList[1].relatedInstance.instanceIdJSONPATHJSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +}}http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/202${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}http://localhost/orchestrationRequests/v2200"requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":null,"modelCustomizationId":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DNS_TEST","suppressRollback":true,"requestorId":null},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"subscriber-1","subscriberName":"testSubscriber"},"cloudConfiguration":null,"requestParameters":{"subscriptionServiceType":"MOG","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false,falsefalse"serviceInstanceName":"DNS_TEST","vnfInstanceId":null,"vnfInstanceName":null,"vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null,"requestorId":null},"requestStatus":{"requestState":"falsefalse$.requestList2falsefalsefalse"requestScope":"vnf","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":"DNSResource-1","modelInvariantId":"585822c7-4027-4f84-ba50-e9248606f112","modelType":"vnf","modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe","modelName":"DNSResource","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":null,"modelCustomizationId":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","orderVersion":null,"source":"VID","instanceName":"DNSTEST1","suppressRollback":false,"requestorId":null},"relatedInstanceList":[{"relatedInstance":{"instanceName":null,"instanceId":"falsefalse"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":null,"modelCustomizationId":null}}}],"subscriberInfo":null,"cloudConfiguration":{"aicNodeClli":null,"tenantId":"88a6ca3ee0394ade9403f075db23167e","lcpCloudRegionId":"mdt1"},"requestParameters":{"subscriptionServiceType":null,"userParams":[],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false,falsefalse"serviceInstanceName":null,"vnfInstanceId":null,"vnfInstanceName":"DNSTEST1","vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null,"requestorId":null},"requestStatus":{"requestState":falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsfiltertransfer-to-create-vfmodule-requestResponseCreate VNF$.requestReferences.instanceIdRequestCreate VFModule$.requestDetails.relatedInstanceList[1].relatedInstance.instanceIdJSONPATHJSONPATHtrueset-testcase-requestId-propertyResponseCreate VNF$.requestReferences.requestIdrequestId#TestCase#JSONPATHXPATHtrueset-testcase-vnfInstanceId-propertyResponseCreate VNF$.requestReferences.instanceIdvnfInstanceId#TestCase#JSONPATHXPATHtruetransfer-to-create-volumegroups-requestResponseCreate VNF$.requestReferences.instanceIdRequestCreate VolumeGroups$.requestDetails.relatedInstanceList[1].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-volumegroups-requestResponseCreate VNF$.requestReferences.instanceIdRequestUpdate VolumeGroups$.requestDetails.relatedInstanceList[1].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-update-vfmodule-requestResponseCreate VNF$.requestReferences.instanceIdRequestUpdate VFModule$.requestDetails.relatedInstanceList[1].relatedInstance.instanceIdJSONPATHJSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1360,7 +1360,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>http://${#Project#host}{"requestDetails": { +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host}{"requestDetails": { + "cloudConfiguration": { + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "lcpCloudRegionId": "MT" + }, "modelInfo": { "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", "modelName": "VF_DNS::module-1", @@ -1368,10 +1372,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f132" }, - "cloudConfiguration": { - "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "lcpCloudRegionId": "MT" - }, "relatedInstanceList": [ {"relatedInstance": { "modelInfo": { @@ -1381,7 +1381,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" + "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82" }}, {"relatedInstance": { "modelInfo": { @@ -1392,19 +1392,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelCustomizationName": "DNSResource-1", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112" }, - "instanceId": "1ac28783-8268-41b0-a653-36d0d09d0695" + "instanceId": "f90f877a-3c08-43f1-b1eb-e0bd282c0b81" }} ], "requestInfo": { - "source": "VID", "suppressRollback": true, + "source": "VID", "instanceName": "VF_DNS-base-module-1" }, "requestParameters": {"userParams": []} }}http://localhost/ecomp/mso/infra/serviceInstances/v2/3713d5de-942f-41c4-a1b7-08245bc640cc/vnfs/132677e7-8ed2-4a51-9758-9eff2c608d90/vfModules202${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings -serviceInstanceIdvnfInstanceIdset-testcase-vfModuleInstanceId-propertyResponseCreate VFModule$.requestReferences.instanceIdvfModuleInstanceId#TestCase#JSONPATHXPATHtrueset-testcase-requestId-propertyResponseCreate VFModule$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +serviceInstanceIdvnfInstanceIdset-testcase-vfModuleInstanceId-propertyResponseCreate VFModule$.requestReferences.instanceIdvfModuleInstanceId#TestCase#JSONPATHXPATHtrueset-testcase-requestId-propertyResponseCreate VFModule$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1414,7 +1414,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { "modelInfo": { "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", "modelName": "VF_DNS::module-1", @@ -1435,7 +1435,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" + "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82" }}, {"relatedInstance": { "modelInfo": { @@ -1446,7 +1446,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelCustomizationName": "DNSResource-1", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112" }, - "instanceId": "1ac28783-8268-41b0-a653-36d0d09d0695" + "instanceId": "f90f877a-3c08-43f1-b1eb-e0bd282c0b81" }} ], "requestInfo": { @@ -1459,7 +1459,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -set-testcase-requestId-propertyResponseUpdate VFModule$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +set-testcase-requestId-propertyResponseUpdate VFModule$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1469,7 +1469,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { "modelInfo":{ "modelCustomizationName":"ebad642f-a0e6-49bd-90a5 1", "modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", @@ -1490,7 +1490,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -set-testcase-requestId-propertyResponseDelete VFModule$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +set-testcase-requestId-propertyResponseDelete VFModule$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1500,7 +1500,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { "modelInfo":{ "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", "modelName": "DNSResource", @@ -1520,7 +1520,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" http://localhost/ecomp/mso/infra/serviceInstances/v2/1abf1f1f-513c-4e9a-8294-a0932339a788/vnfs/65833f1d-d2ec-42ef-a316-c44be958acf7202No Authorization -set-testcase-requestId-propertyResponseDelete VNF$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +set-testcase-requestId-propertyResponseDelete VNF$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1530,7 +1530,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { "modelInfo":{ "modelCustomizationName":"", "modelType":"service", @@ -1563,7 +1563,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" + "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82" }}, {"relatedInstance": { "modelInfo": { @@ -1574,7 +1574,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelCustomizationName": "DNSResource-1", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112" }, - "instanceId": "1ac28783-8268-41b0-a653-36d0d09d0695" + "instanceId": "f90f877a-3c08-43f1-b1eb-e0bd282c0b81" }} ], "requestInfo": { @@ -1586,7 +1586,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" }}http://localhost/ecomp/mso/infra/serviceInstances/v2//vnfs//volumeGroups202${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings -serviceInstanceIdvnfInstanceIdset-testcase-volumeGroupId-propertyResponseCreate VolumeGroups$.requestReferences.instanceIdvomuleGroupInstanceId#TestCase#JSONPATHXPATHtrueset-testcase-requestIdResponseCreate VolumeGroups$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +serviceInstanceIdvnfInstanceIdset-testcase-volumeGroupId-propertyResponseCreate VolumeGroups$.requestReferences.instanceIdvomuleGroupInstanceId#TestCase#JSONPATHXPATHtrueset-testcase-requestIdResponseCreate VolumeGroups$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1596,7 +1596,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>http://${#Project#host}{"requestDetails": { +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host}{"requestDetails": { "cloudConfiguration": { "tenantId": "88a6ca3ee0394ade9403f075db23167e", "lcpCloudRegionId": "MT2" @@ -1616,7 +1616,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" + "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82" }}, {"relatedInstance": { "modelInfo": { @@ -1627,7 +1627,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelCustomizationName": "DNSResource-1", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112" }, - "instanceId": "1ac28783-8268-41b0-a653-36d0d09d0695" + "instanceId": "f90f877a-3c08-43f1-b1eb-e0bd282c0b81" }} ], "requestInfo": { @@ -1639,7 +1639,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -serviceInstanceIdvnfInstanceIdvolumeGroupInstanceIdset-testcase-requestIdResponseUpdate VolumeGroups$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +serviceInstanceIdvnfInstanceIdvolumeGroupInstanceIdset-testcase-requestIdResponseUpdate VolumeGroups$.requestReferences.requestIdrequestId#TestCase#JSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1649,7 +1649,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { "modelInfo": { "modelName": "Mog111..mog_psm..module-1", "modelType": "volumeGroup", @@ -1668,14 +1668,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { - "modelInfo": { - "modelName": "CONTRAIL30_BASIC", - "modelType": "network" - }, "cloudConfiguration": { "tenantId": "cff319d50266491fa744b0d493a51ce0", "lcpCloudRegionId": "rdm3" }, + "modelInfo": { + "modelName": "CONTRAIL30_BASIC", + "modelType": "network" + }, "relatedInstanceList": [{"relatedInstance": { "modelInfo": { "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", @@ -1684,7 +1684,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" + "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82" }}], "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -1692,7 +1692,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "instanceName": "MNS-25180-L-06Private_tst_mns_mgmt_net_1" }, "requestParameters": {} -}}http://localhost/ecomp/mso/infra/serviceInstances/v2/serviceInstanceId/networks202${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsset-updateCreateNetworkRequstStatus-requestIdResponseCreate Networks$.requestReferences.requestIdrequestId#TestCase#JSONPATHXQUERYtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +}}http://localhost/ecomp/mso/infra/serviceInstances/v2/serviceInstanceId/networks202${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsset-updateCreateNetworkRequstStatus-requestIdResponseCreate Networks$.requestReferences.requestIdrequestId#TestCase#JSONPATHXQUERYtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1702,15 +1702,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#networkId} -]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { - "modelInfo": { - "modelName": "CONTRAIL30_BASIC", - "modelType": "network" - }, +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { "cloudConfiguration": { "tenantId": "cff319d50266491fa744b0d493a51ce0", "lcpCloudRegionId": "rdm3" }, + "modelInfo": { + "modelName": "CONTRAIL30_BASIC", + "modelType": "network" + }, "relatedInstanceList": [{"relatedInstance": { "modelInfo": { "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", @@ -1719,7 +1719,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" + "instanceId": "a82d6977-6493-484f-ae8c-1b2f442e0d82" }}], "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -1730,7 +1730,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" }}http://localhost/ecomp/mso/infra/serviceInstances/v2/c173e25c-adc4-4e66-9702-24cbd75a2243/networks/925f94f5-7ec6-4d99-a5e1-091c33709b76202No Authorization -set-updateCreateNetworkRequstStatus-requestIdResponseUpdaate Networks$.requestReferences.requestIdrequestId#TestCase#JSONPATHXQUERYtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +set-updateCreateNetworkRequstStatus-requestIdResponseUpdaate Networks$.requestReferences.requestIdrequestId#TestCase#JSONPATHXQUERYtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1740,7 +1740,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#networkId} -]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { "modelInfo":{ "modelType":"network", "modelName":"CONTRAIL30_BASIC", @@ -1780,7 +1780,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "name": "someUserParam", "value": "someValue" - } + } ] } } @@ -1809,7 +1809,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "name": "someUserParam", "value": "someValue" - } + } ] } } @@ -1837,7 +1837,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "name": "someUserParam", "value": "someValue" - } + } ] } } @@ -1865,12 +1865,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "name": "someUserParam", "value": "someValue" - } + } ] } } }http://localhost/ecomp/mso/infra/serviceInstances/v2202 -${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsset-serviceInstanceId-propertyResponseCreate Service 2$.requestReferences.instanceIdserviceInstanceId#TestCase#JSONPATHXQUERYtrueset-requestId-propertyResponseCreate Service 2$.requestReferences.requestIdrequestId#TestCase#JSONPATHXQUERYtruetransfer-to-create-network-urlResponseCreate Service 2$.requestReferences.instanceIdRequestCreate Networks with wrong BPMN script URL$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-create-network-urlResponseCreate Service 2$.requestReferences.instanceIdRequestCreate Networks with no BPMN script$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtrue5000MsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsset-serviceInstanceId-propertyResponseCreate Service 2$.requestReferences.instanceIdserviceInstanceId#TestCase#JSONPATHXQUERYtrueset-requestId-propertyResponseCreate Service 2$.requestReferences.requestIdrequestId#TestCase#JSONPATHXQUERYtruetransfer-to-create-network-urlResponseCreate Service 2$.requestReferences.instanceIdRequestCreate Networks with wrong BPMN script URL$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-create-network-urlResponseCreate Service 2$.requestReferences.instanceIdRequestCreate Networks with no BPMN script$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtrue5000MsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1880,7 +1880,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>http://${#Project#host}{ +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host}{ "requestDetails": { "modelInfo": { "modelType": "service", @@ -1904,7 +1904,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" { "name": "someUserParam", "value": "someValue" - } + } ] } } @@ -2094,4 +2094,4 @@ try { } finally { try { if ( con != null ) con.close(); } catch ( Exception ignoreThis ) {} } -requestId76c15633-b6f2-4281-9ba2-73b516734c04serviceInstanceIdf75b1c7d-e878-40a3-8877-bc5605615f4dvnfInstanceId1ac28783-8268-41b0-a653-36d0d09d0695vfModuleInstanceId38b74487-c406-47d7-a9eb-530dd89242ccvomuleGroupInstanceId20e3e2f9-25a3-494e-8108-cafa3ff992f1networkIdebdd074d-ba30-4d44-921c-323cec4e78fchostlocalhost:8080user-infraportalInfraPortalClientpassword-infraportalpassword1$db-driver \ No newline at end of file +requestId1cf0f4b3-8e50-4b14-bc46-37514b5f2cd4serviceInstanceIda82d6977-6493-484f-ae8c-1b2f442e0d82vnfInstanceIdf90f877a-3c08-43f1-b1eb-e0bd282c0b81vfModuleInstanceId38b74487-c406-47d7-a9eb-530dd89242ccvomuleGroupInstanceId20e3e2f9-25a3-494e-8108-cafa3ff992f1networkIdebdd074d-ba30-4d44-921c-323cec4e78fchostlocalhost:8080user-infraportalInfraPortalClientpassword-infraportalpassword1$db-driverdbadapteruserBPELClientdbadapterpasswordpassword1$ \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSONetworkAdapter-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSONetworkAdapter-soapui-project.xml index 27c7fecd7e..f38cf809a9 100644 --- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSONetworkAdapter-soapui-project.xml +++ b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSONetworkAdapter-soapui-project.xml @@ -1,8 +1,8 @@ -file:\C:\Dev\Git\mso-unified\adapters\mso-network-adapter\target\generated-sources\wsdl\NetworkAdapter.wsdl - +file:\C:\Dev\Git\mso-unified\adapters\mso-network-adapter\target\generated-sources\wsdl\NetworkAdapter.wsdl + - + @@ -190,34 +190,34 @@ - - + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -300,7 +300,7 @@ -]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URL<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter\r +]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URL<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter\r \r \r \r @@ -323,7 +323,7 @@ \r \r \r -]]>No AuthorizationUTF-8REPLACE_WITH_ACTUAL_URL\r +]]>No AuthorizationUTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -340,12 +340,12 @@ \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -361,7 +361,7 @@ \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -394,7 +394,7 @@ \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -415,7 +415,7 @@ \r \r \r -]]>SEQUENTIALMsoNetworkAdapterImplPortBindingcreateNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter +]]>SEQUENTIALMsoNetworkAdapterImplPortBindingcreateNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter @@ -424,7 +424,7 @@ vlan tete - + titi10 @@ -432,13 +432,13 @@ - + requestIdserviceInstanceId -]]>500CloudSite does not exist in MSO ConfigurationfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingcreateNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter +]]>500CloudSite does not exist in MSO ConfigurationfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingcreateNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter @@ -446,7 +446,7 @@ b0784c65ad104c9ab2df27c1b2e04bd0 vlan - + titi10 @@ -454,13 +454,13 @@ - + requestIdserviceInstanceId -]]>500Create Network: Missing parameters: networkNamefalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingcreateNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter +]]>500Create Network: Missing parameters: networkNamefalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingcreateNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter @@ -468,7 +468,7 @@ b0784c65ad104c9ab2df27c1b2e04bd0 tata - + titi10 @@ -476,13 +476,13 @@ - + requestIdserviceInstanceId -]]>500<faultstring>CreateNetwork: Unknown Network Type: tata</faultstring>falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingdeleteNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r +]]>500<faultstring>CreateNetwork: Unknown Network Type: tata</faultstring>falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingdeleteNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r @@ -500,7 +500,7 @@ ]]>500 -<message>Unknown Network Type: ?</message>falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingdeleteNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r +[DeleteNetwork] Cloud Site [?] not foundfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingdeleteNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r @@ -517,12 +517,12 @@ ]]>500 -<faultstring>Missing mandatory parameter cloudSiteId, tenantId or networkId</faultstring>falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindinghealthCheck<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r +<faultstring>Missing mandatory parameter cloudSiteId, tenantId or networkId</faultstring>falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindinghealthCheck<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r \r \r \r \r -]]>200BPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingqueryNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r +]]>200BPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingqueryNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r \r \r \r @@ -538,7 +538,7 @@ \r \r \r -]]>500CloudSite does not exist in MSO ConfigurationfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingrollbackNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r +]]>500CloudSite does not exist in MSO ConfigurationfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingrollbackNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r \r \r \r @@ -572,7 +572,7 @@ \r \r \r -]]>500<message>Rollback Network: Unknown Network Type: ?</message>falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingupdateNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r +]]>500<message>Rollback Network: Unknown Network Type: ?</message>falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoNetworkAdapterImplPortBindingupdateNetwork<xml-fragment/>UTF-8http://${#Project#host}/networks/NetworkAdapter\r \r \r \r @@ -593,4 +593,4 @@ \r \r \r -]]>500 CloudSite does not exist in MSO ConfigurationfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP Settingshostlocalhost:18080 \ No newline at end of file +]]>500 CloudSite does not exist in MSO ConfigurationfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP Settingshostlocalhost:8080 \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOTenantAdapter-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOTenantAdapter-soapui-project.xml index 8e4958047b..f3afbd354d 100644 --- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOTenantAdapter-soapui-project.xml +++ b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOTenantAdapter-soapui-project.xml @@ -1,8 +1,8 @@ -file:\C:\Dev\Git\mso\adapters\mso-tenant-adapter\target\generated-sources\wsdl\TenantAdapter.wsdl - +file:\C:\Dev\Git\mso\adapters\mso-tenant-adapter\target\generated-sources\wsdl\TenantAdapter.wsdl + - + @@ -164,29 +164,29 @@ - - - + + + - - - - + + + + - - + + - - - + + + - - - + + + @@ -257,7 +257,7 @@ -]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URLUTF-8REPLACE_WITH_ACTUAL_URL\r +]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URLUTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -283,7 +283,7 @@ \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -298,12 +298,12 @@ \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -318,7 +318,7 @@ \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -338,7 +338,7 @@ \r \r \r -]]>SEQUENTIALMsoTenantAdapterImplPortBindingcreateTenant<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r +]]>SEQUENTIALMsoTenantAdapterImplPortBindingcreateTenant<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r \r \r \r @@ -364,7 +364,7 @@ \r \r \r -]]>For input string: "pa"falsefalse${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP SettingsMsoTenantAdapterImplPortBindingdeleteTenant<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r +]]>failed: Connection refusedfalsefalse${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP SettingsMsoTenantAdapterImplPortBindingdeleteTenant<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r \r \r \r @@ -379,12 +379,12 @@ \r \r \r -]]>For input string: "pa"falsefalse${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP SettingsMsoTenantAdapterImplPortBindinghealthCheck<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r +]]>failed: Connection refusedfalsefalse${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP SettingsMsoTenantAdapterImplPortBindinghealthCheck<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r \r \r \r \r -]]>200${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP SettingsMsoTenantAdapterImplPortBindingqueryTenant<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r +]]>200${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP SettingsMsoTenantAdapterImplPortBindingqueryTenant<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r \r \r \r @@ -399,7 +399,7 @@ \r \r \r -]]>For input string: "pa"falsefalse${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP SettingsMsoTenantAdapterImplPortBindingrollbackTenant<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r +]]>failed: Connection refusedfalsefalse${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP SettingsMsoTenantAdapterImplPortBindingrollbackTenant<xml-fragment/>UTF-8http://${#Project#host}/tenants/TenantAdapter\r \r \r \r @@ -419,4 +419,4 @@ \r \r \r -]]>For input string: "pa"falsefalse${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP Settingshostlocalhost:18080user-bpelBPELClientpassword-bpelpassword1$ \ No newline at end of file +]]>failed: Connection refusedfalsefalse${#Project#user-bpel}${#Project#password-bpel}BasicBasicGlobal HTTP Settingshostlocalhost:18080user-bpelBPELClientpassword-bpelpassword1$ \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOVnfAdapter-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOVnfAdapter-soapui-project.xml index ea83a2ab73..4d704d1908 100644 --- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOVnfAdapter-soapui-project.xml +++ b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MSOVnfAdapter-soapui-project.xml @@ -1,8 +1,8 @@ -file:\C:\Dev\Git\mso\adapters\mso-vnf-adapter\target\generated-sources\wsdl\VnfAdapter.wsdl - +file:\C:\Dev\Git\mso\adapters\mso-vnf-adapter\target\generated-sources\wsdl\VnfAdapter.wsdl + - + @@ -244,34 +244,34 @@ - - - - + + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -354,7 +354,7 @@ -]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URL<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r +]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URL<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r \r \r \r @@ -384,7 +384,7 @@ \r \r \r -]]>BPELClientpassword1$BasicBasicGlobal HTTP SettingsUTF-8REPLACE_WITH_ACTUAL_URL\r +]]>BPELClientpassword1$BasicBasicGlobal HTTP SettingsUTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -400,12 +400,12 @@ \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -421,7 +421,7 @@ \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -444,7 +444,7 @@ \r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -472,7 +472,7 @@ \r \r \r -]]>SEQUENTIALMsoVnfAdapterImplPortBindingcreateVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter +]]>SEQUENTIALMsoVnfAdapterImplPortBindingcreateVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter @@ -502,7 +502,7 @@ -]]><message>[CreateVFModule] Cloud Site [Toto] not found</message>falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingcreateVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter +]]><message>[CreateVFModule] Cloud Site [Toto] not found</message>falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingcreateVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter @@ -532,7 +532,7 @@ -]]>CreateVFModule:QueryStack:TokenAuth] For input string: "pa"falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingdeleteVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r +]]>failed: Connection refusedfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingdeleteVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r \r \r \r @@ -548,12 +548,12 @@ \r \r \r -]]>TokenAuth] For input string: "pa"falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindinghealthCheck<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r +]]>failed: Connection refusedfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindinghealthCheck<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r \r \r \r \r -]]>200BPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingqueryVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r +]]>200BPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingqueryVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r \r \r \r @@ -569,7 +569,7 @@ \r \r \r -]]>TokenAuth] For input string: "pa"falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingrollbackVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r +]]>failed: Connection refusedfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingrollbackVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r \r \r \r @@ -592,7 +592,7 @@ \r \r \r -]]>TokenAuth] For input string: "pa"falsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingupdateVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r +]]>failed: Connection refusedfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP SettingsMsoVnfAdapterImplPortBindingupdateVnf<xml-fragment/>UTF-8http://${#Project#host}/vnfs/VnfAdapter\r \r \r \r @@ -620,4 +620,4 @@ \r \r \r -]]>TokenAuth] For input string: "pa"falsefalseBPELClientpassword1$BasicBasicGlobal HTTP Settingshostlocalhost:18080 \ No newline at end of file +]]>failed: Connection refusedfalsefalseBPELClientpassword1$BasicBasicGlobal HTTP Settingshostlocalhost:18080 \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MsoRequestDB-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MsoRequestDB-soapui-project.xml index 6c39113a94..fd68b22623 100644 --- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/MsoRequestDB-soapui-project.xml +++ b/packages/arquillian-unit-tests/src/test/resources/SoapUI/MsoRequestDB-soapui-project.xml @@ -1,8 +1,8 @@ -file:/RequestsDbAdapter.wsdl - +file:/RequestsDbAdapter.wsdl + - + @@ -136,18 +136,18 @@ - - - + + + - - - + + + - - + + @@ -191,14 +191,14 @@ -]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URLUTF-8REPLACE_WITH_ACTUAL_URL\r +]]>http://schemas.xmlsoap.org/wsdl/REPLACE_WITH_ACTUAL_URLUTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r ?\r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL\r +]]>UTF-8REPLACE_WITH_ACTUAL_URL\r \r \r \r @@ -216,15 +216,15 @@ ?\r \r \r -]]>UTF-8REPLACE_WITH_ACTUAL_URL +]]>UTF-8REPLACE_WITH_ACTUAL_URL ? -]]>http://localhost:8080application/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502 409v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host}]]>http://localhost:8080application/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404 502 409v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host} 3d878a8e-51fa-44aa-8cb5-a56ae9352252 @@ -238,12 +238,12 @@ AUSTXAALCP1 276b95b6d2b04e2e830c976eb70c9405 - + -]]>http://localhost/ecomp/mso/v1/services${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsrequest-idTEMPLATEapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data*/*200v1:query-response0dataapplication/octet-stream200v1:vnf-request<xml-fragment/>http://${#Project#host} +]]>http://localhost/ecomp/mso/v1/services${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsrequest-idTEMPLATEapplication/xmlv1:service-requesttext/html500htmlapplication/xml500 400 503 404v1:service-responseapplication/xml202v1:service-responsetext/html;charset=utf-8401 404 403 405 500html0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data*/*200v1:query-response0dataapplication/octet-stream200v1:vnf-request<xml-fragment/>http://${#Project#host} 155415ab-b4a7-4382-b4c6-d17d950565 FeatureChangeActivateRequest @@ -263,8 +263,8 @@ ST E2E Test50565_13000050565 -]]>http://localhost/ecomp/mso/v1/services/feature${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsrequest-idSEQUENTIAL<xml-fragment/>http://${#Project#host}http://localhost/ecomp/mso/v1/services/feature${#Project#user-csi}${#Project#password-csi}BasicBasicGlobal HTTP Settingsrequest-idSEQUENTIAL<xml-fragment/>http://${#Project#host} IntegTestsInfra @@ -278,30 +278,30 @@ AUSTXAALCP1 276b95b6d2b04e2e830c976eb70c9405 - + -]]>http://localhost/ecomp/mso/v1/services500,400<request-status>FAILED</request-status>falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP SettingsRequestIdResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://ecomp.att.com/mso/infra/vnf-request/v1'; +]]>http://localhost/ecomp/mso/v1/services500,400<request-status>FAILED</request-status>falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP SettingsRequestIdResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1'; //vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]RequestupdateInfraRequestdeclare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/'; -declare namespace req='http://com.att.mso/requestsdb'; +declare namespace req='http://org.openecomp.mso/requestsdb'; //soapenv:Envelope/soapenv:Body/req:updateInfraRequest/requestId -trueToGetResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://ecomp.att.com/mso/infra/vnf-request/v1'; -//vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]request-idGet Infra requesttrueToSoapGetResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://ecomp.att.com/mso/infra/vnf-request/v1'; +trueToGetResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1'; +//vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]request-idGet Infra requesttrueToSoapGetResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1'; //vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]Requestget infra soapdeclare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/'; -declare namespace req='http://com.att.mso/requestsdb'; +declare namespace req='http://org.openecomp.mso/requestsdb'; //soapenv:Envelope/soapenv:Body/req:getInfraRequest/requestId -trueRequestId2ResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://ecomp.att.com/mso/infra/vnf-request/v1'; +trueRequestId2ResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1'; //vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]RequestupdateInfraRequest 2declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/'; -declare namespace req='http://com.att.mso/requestsdb'; +declare namespace req='http://org.openecomp.mso/requestsdb'; //soapenv:Envelope/soapenv:Body/req:updateInfraRequest/requestId -XPATHXPATHtrueToSoapGet2ResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://ecomp.att.com/mso/infra/vnf-request/v1'; +XPATHXPATHtrueToSoapGet2ResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1'; //vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]Requestget infra soap 2declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/'; -declare namespace req='http://com.att.mso/requestsdb'; +declare namespace req='http://org.openecomp.mso/requestsdb'; //soapenv:Envelope/soapenv:Body/req:getInfraRequest/requestId -XPATHXPATHtrueRequestId statusResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://ecomp.att.com/mso/infra/vnf-request/v1'; +XPATHXPATHtrueRequestId statusResponsePOST VNF infra request - NO BPELdeclare namespace vnf='http://org.openecomp/mso/infra/vnf-request/v1'; //vnf:vnf-request[1]/vnf:request-info[1]/vnf:request-id[1]RequestupdateInfraRequest statusdeclare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/'; -declare namespace req='http://com.att.mso/requestsdb'; +declare namespace req='http://org.openecomp.mso/requestsdb'; //soapenv:Envelope/soapenv:Body/req:updateInfraRequest/requestId -XPATHXPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +XPATHXPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -310,7 +310,7 @@ declare namespace req='http://com.att.mso/requestsdb'; IN_PROGRESS -]]>200No AuthorizationMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP SettingsMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -319,10 +319,10 @@ declare namespace req='http://com.att.mso/requestsdb'; COMPLETE -]]>200No Authorization<xml-fragment/>http://${#Project#host} +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host} 155415ab-b4a7-4382-b4c6-d17d950565 FeatureChangeActivateRequest @@ -342,14 +342,14 @@ declare namespace req='http://com.att.mso/requestsdb'; ST E2E Test50565_13000050565 -]]>http://localhost/ecomp/mso/v1/services/feature200<request-status>COMPLETE</request-status>falsefalse(?s).*<request-id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}<\/request-id>(?s).*falsetrue${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsrequest-idMsoRequestsDbAdapterImplPortBindinggetInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +]]>http://localhost/ecomp/mso/v1/services/feature200<request-status>COMPLETE</request-status>falsefalse(?s).*<request-id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}<\/request-id>(?s).*falsetrue${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsrequest-idMsoRequestsDbAdapterImplPortBindinggetInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter 22ae9257-022b-4050-8b31-998034cc49a8 -]]><lastModifiedBy>Arq</lastModifiedBy>falsefalseNo AuthorizationMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +]]><lastModifiedBy>Arq</lastModifiedBy>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP SettingsMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -367,11 +367,11 @@ declare namespace req='http://com.att.mso/requestsdb'; OneSmallStepForMan -]]>200No AuthorizationMsoRequestsDbAdapterImplPortBindinggetInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +]]>200${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP SettingsMsoRequestsDbAdapterImplPortBindinggetInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter 22ae9257-022b-4050-8b31-998034cc49a8 -]]><lastModifiedBy>Arq</lastModifiedBy>falsefalseNo Authorizationhostlocalhost:18080user-infraportalInfraPortalClientpassword-infraportalpassword1$ \ No newline at end of file +]]><lastModifiedBy>Arq</lastModifiedBy>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settingshostlocalhost:18080user-infraportalInfraPortalClientpassword-infraportalpassword1$dbadapteruserBPELClientdbadapterpasswordpassword1$ \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml b/packages/arquillian-unit-tests/src/test/resources/arquillian.xml index 7606450809..7377d16729 100644 --- a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml +++ b/packages/arquillian-unit-tests/src/test/resources/arquillian.xml @@ -18,7 +18,7 @@ CUBE mso: - image: ecomp/mso-arquillian:${images.version} + image: openecomp/mso-arquillian:${images.version} beforeStop: - copy: from: /opt/jboss/standalone/log/ @@ -45,7 +45,7 @@ - mariadb:mariadb - jacoco-shared:jacoco-shared jacoco-shared: - image: ecomp/jacoco:1.0 + image: openecomp/jacoco:1.0 beforeStop: - copy: from: /shared/jacoco-it.exec diff --git a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json b/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json index 994d17ea98..0b2c7aa807 100644 --- a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json +++ b/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json @@ -3,11 +3,11 @@ "description": "MSO Docker Images", "chef_type": "environment", "json_class": "Chef::Environment", - "default_attributes": + "default_attributes": { "mso_config_path": "/etc/mso/config.d/", - "mso-api-handler-infra-config": + "mso-api-handler-infra-config": { "bpelURL": "http://mso:8080", "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1", @@ -15,9 +15,9 @@ "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1" }, - "asdc-connections": + "asdc-connections": { - "asdc-controller1": + "asdc-controller1": { "user": "user", "consumerGroup": "mso", @@ -33,7 +33,7 @@ "keyStorePath": "" }, - "asdc-controller2": + "asdc-controller2": { "user": "user", "consumerGroup": "mso", @@ -50,9 +50,9 @@ } }, - "mso-sdnc-adapter-config": + "mso-sdnc-adapter-config": { - "sdncurls": + "sdncurls": [ "https://localhost:8443/restconf/operations/L3SDN-API:", "https://localhost:8443/restconf/config/L3SDN-API:", @@ -69,15 +69,15 @@ "sdncconnecttime": "5000" }, - "mso-po-adapter-config": + "mso-po-adapter-config": { - "identity_services": + "identity_services": [ { "dcp_clli": "MT_KEYSTONE", "identity_url": "https://localhost:5000/v2.0", "mso_id": "userid", - "mso_pass": "password", + "mso_pass": "313DECE408AF7759D442D7B06DD9A6AA", "admin_tenant": "service", "member_role": "admin", "tenant_metadata": "true", @@ -89,7 +89,7 @@ "dcp_clli": "MT_KEYSTONE2", "identity_url": "https://localhost:5000/v2.0", "mso_id": "userid", - "mso_pass": "password", + "mso_pass": "313DECE408AF7759D442D7B06DD9A6AA", "admin_tenant": "service", "member_role": "admin", "tenant_metadata": "true", @@ -98,7 +98,7 @@ } ], - "cloud_sites": + "cloud_sites": [ { "id": "MT", @@ -122,12 +122,12 @@ "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1" }, - "mso-bpmn-config": + "mso-bpmn-config": { "urnFileSystemLoadingEnabled": "true" }, - "mso-bpmn-urn-config": + "mso-bpmn-urn-config": { "logDebugAsyncQueryAAICustomer": "false", "logDebugChangeFeatureActivateV1": "false", @@ -172,6 +172,7 @@ "adaptersDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter", "adaptersSdncEndpoint": "http://mso:8080/adapters/SDNCAdapter", "adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter", + "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", "workflowSdncadapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService", "msoKey": "07a7159d3bf51a0e53be7a8f89699be7", "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", @@ -208,11 +209,11 @@ } }, - "override_attributes": + "override_attributes": { }, - "cookbook_versions": + "cookbook_versions": { "mso-config": "~> 1.0.0" } diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json index 91e6ac8a9e..9f51e8314b 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json @@ -4,21 +4,27 @@ "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132", "vfModuleModelVersion": "1.0", "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI1_DNS::module-1::module-1.group", + "vfModuleModelDescription": "vf Module Description", + "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132", "isBase": true, "artifacts": [ "Artifact-UUID1", "EnvArtifact-UUID1" - ] + ], + "properties": {"test":"test"} }, { "vfModuleModelName": "VF_RI1_DNS::module-2", "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f133", "vfModuleModelVersion": "1.0", "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI1_DNS::module-2::module-1.group", + "vfModuleModelDescription": "vf Module Description", + "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f133", "isBase": false, "artifacts": [ "Artifact-UUID2", "EnvArtifact-UUID2" - ] + ], + "properties": {"test":"test"} } ] \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json index 63f32cbdd4..ebda7b7aea 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json @@ -3,12 +3,12 @@ "serviceInvariantUUID": "585822c8-4027-4f84-ba50-e9248606f111", "serviceUUID": "1e34774e-715e-4fd6-bd09-7b654622f35i", "serviceVersion": "1.0", - "serviceArtifacts": + "serviceArtifacts": [ - + ], - "resources": + "resources": [ { "resourceInstanceName": "DNSResource-1", @@ -17,13 +17,14 @@ "resourceType": "VF", "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f131", "resourceVersion": "1.0", - "artifacts": + "category": "category", + "artifacts": [ { "artifactChecksum": "CheckSum", "artifactDescription": "Meta data for VFModule", "artifactName": "vnf-module-artifact.json", - + "artifactType": "VF_MODULES_METADATA", "artifactURL": "vnf-module-artifact.json", "artifactUUID": "VfArtifact-UUID1", @@ -40,9 +41,9 @@ "artifactUUID": "Artifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID1", - "relatedArtifact": + "relatedArtifact": [ - + ] }, @@ -50,12 +51,12 @@ "artifactChecksum": "CheckSum", "artifactDescription": "BASE VLB ENV file", "artifactName": "base_vlb.env", - + "artifactType": "HEAT_ENV", "artifactURL": "base_vlb.env", "artifactUUID": "EnvArtifact-UUID1", "artifactVersion": "1.0" - + }, { "artifactChecksum": "CheckSum", @@ -67,9 +68,9 @@ "artifactUUID": "Artifact-UUID2", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID2", - "relatedArtifact": + "relatedArtifact": [ - + ] }, @@ -77,12 +78,12 @@ "artifactChecksum": "CheckSum", "artifactDescription": "DNS Scaling ENV file", "artifactName": "dnsscaling.env", - + "artifactType": "HEAT_ENV", "artifactURL": "dnsscaling.env", "artifactUUID": "EnvArtifact-UUID2", "artifactVersion": "1.0" - + } ] diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json index 5a732fcd47..0e45ba6434 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json @@ -4,10 +4,13 @@ "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134", "vfModuleModelVersion": "1.0", "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group", + "vfModuleModelDescription": "vf Module Description", + "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f134", "isBase": true, "artifacts": [ "Artifact-UUID3", "EnvArtifact-UUID3" - ] + ], + "properties": {"test":"test"} } ] \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json index 63ca36efcb..bec8bedf06 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json @@ -3,12 +3,12 @@ "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f112", "serviceUUID": "2e34774e-715e-4fd5-bd09-7b654622f35i", "serviceVersion": "1.0", - "serviceArtifacts": + "serviceArtifacts": [ - + ], - "resources": + "resources": [ { "resourceInstanceName": "VFWResource-1", @@ -17,13 +17,14 @@ "resourceType": "VF", "resourceUUID": "685822c7-4027-4f84-ba50-e9248606f132", "resourceVersion": "1.0", - "artifacts": + "category": "category", + "artifacts": [ { "artifactChecksum": "CheckSum", "artifactDescription": "Meta data for VFModule", "artifactName": "vnf-module-artifact.json", - + "artifactType": "VF_MODULES_METADATA", "artifactURL": "vnf-module-artifact.json", "artifactUUID": "VfArtifact-UUID2", @@ -40,9 +41,9 @@ "artifactUUID": "Artifact-UUID3", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID3", - "relatedArtifact": + "relatedArtifact": [ - + ] }, @@ -50,7 +51,7 @@ "artifactChecksum": "CheckSum", "artifactDescription": "base_vfw ENV file", "artifactName": "base_vfw.env", - + "artifactType": "HEAT_ENV", "artifactURL": "base_vfw.env", "artifactUUID": "EnvArtifact-UUID3", diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json index 2fb12edba0..622ea3c3f5 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json @@ -3,12 +3,12 @@ "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132", "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f33e", "serviceVersion": "1.0", - "serviceArtifacts": + "serviceArtifacts": [ - + ], - "resources": + "resources": [ { "resourceInstanceName": "wrong-resource-1", @@ -17,9 +17,10 @@ "resourceType": "VF", "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136", "resourceVersion": "1.0", - "artifacts": + "category": "category", + "artifacts": [ - + { "artifactChecksum": "CheckSum", "artifactDescription": "Nimbus Heat OAM", @@ -30,7 +31,7 @@ "artifactUUID": "Artifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID2", - "relatedArtifact": + "relatedArtifact": [ "NestedArtifact-UUID3" ] @@ -45,7 +46,7 @@ "artifactURL": "hot-nimbus-oam_v1.0.env", "artifactUUID": "EnvArtifact-UUID2", "artifactVersion": "1.0" - + }, { @@ -57,7 +58,7 @@ "artifactURL": "nested-oam_v1.0.yaml", "artifactUUID": "NestedArtifact-UUID3", "artifactVersion": "1.0" - + } ] } diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json index f196467a9c..29aa4838c7 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json @@ -4,11 +4,14 @@ "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f131", "vfModuleModelVersion": "1.0", "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-0.group", + "vfModuleModelDescription": "vf Module Description", + "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f136", "isBase": true, "artifacts": [ "Artifact-UUID1", "EnvArtifact-UUID2", "NestedArtifact-UUID3" - ] + ] , + "properties": {"test":"test"} } ] \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json index 1f5e081f55..64b4b68927 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json @@ -3,12 +3,12 @@ "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132", "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f33e", "serviceVersion": "1.0", - "serviceArtifacts": + "serviceArtifacts": [ - + ], - "resources": + "resources": [ { "resourceInstanceName": "resource-1", @@ -17,13 +17,14 @@ "resourceType": "VF", "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136", "resourceVersion": "1.0", - "artifacts": + "category": "category", + "artifacts": [ { "artifactChecksum": "CheckSum", "artifactDescription": "Meta data for VFModule", "artifactName": "vnf-module-artifact.json", - + "artifactType": "VF_MODULES_METADATA", "artifactURL": "vnf-module-artifact.json", "artifactUUID": "VfArtifact-UUID1", @@ -40,19 +41,19 @@ "artifactUUID": "Artifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID2" - + }, { "artifactChecksum": "CheckSum", "artifactDescription": "Nimbus Heat ENV OAM", "artifactName": "hot-nimbus-oam_v1.0.env", - + "artifactType": "HEAT_ENV", "artifactURL": "hot-nimbus-oam_v1.0.env", "artifactUUID": "EnvArtifact-UUID2", "artifactVersion": "1.0" - + }, { @@ -64,7 +65,7 @@ "artifactURL": "nested-oam_v1.0.yaml", "artifactUUID": "NestedArtifact-UUID3", "artifactVersion": "1.0" - + } ] } diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json index f196467a9c..301012e63c 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json @@ -4,11 +4,14 @@ "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f131", "vfModuleModelVersion": "1.0", "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-0.group", + "vfModuleModelDescription": "vf Module Description", + "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f131", "isBase": true, "artifacts": [ "Artifact-UUID1", "EnvArtifact-UUID2", "NestedArtifact-UUID3" - ] + ], + "properties": {"test":"test"} } ] \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json index 0b2b312991..ef9f2565a3 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json @@ -3,12 +3,12 @@ "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132", "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f33f", "serviceVersion": "2.0", - "serviceArtifacts": + "serviceArtifacts": [ - + ], - "resources": + "resources": [ { "resourceInstanceName": "resource-1", @@ -17,13 +17,14 @@ "resourceType": "VF", "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136", "resourceVersion": "1.0", - "artifacts": + "category": "category", + "artifacts": [ { "artifactChecksum": "CheckSum", "artifactDescription": "Meta data for VFModule", "artifactName": "vnf-module-artifact.json", - + "artifactType": "VF_MODULES_METADATA", "artifactURL": "vnf-module-artifact.json", "artifactUUID": "VfArtifact-UUID1", @@ -40,7 +41,7 @@ "artifactUUID": "Artifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID2", - "relatedArtifact": + "relatedArtifact": [ "NestedArtifact-UUID3" ] @@ -50,12 +51,12 @@ "artifactChecksum": "CheckSum", "artifactDescription": "Nimbus Heat ENV OAM", "artifactName": "hot-nimbus-oam_v1.0.env", - + "artifactType": "HEAT_ENV", "artifactURL": "hot-nimbus-oam_v1.0.env", "artifactUUID": "EnvArtifact-UUID2", "artifactVersion": "1.0" - + }, { @@ -67,7 +68,7 @@ "artifactURL": "nested-oam_v1.0.yaml", "artifactUUID": "NestedArtifact-UUID3", "artifactVersion": "1.0" - + } ] } diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json index 7f1051d625..50fb1b7f18 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json @@ -4,6 +4,8 @@ "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132", "vfModuleModelVersion": "1.0", "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-1.group", + "vfModuleModelDescription": "vf Module Description", + "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132", "isBase": true, "artifacts": [ "Artifact-UUID1", @@ -12,6 +14,7 @@ "ScriptArtifact-UUID1", "VolumeArtifact-UUID1", "VolumeEnvArtifact-UUID1" - ] + ], + "properties": {"test":"test"} } ] \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json index fc017acb5e..c5c6f92a73 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json @@ -3,12 +3,12 @@ "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f133", "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f34g", "serviceVersion": "3.0", - "serviceArtifacts": + "serviceArtifacts": [ - + ], - "resources": + "resources": [ { "resourceInstanceName": "resource-1", @@ -17,13 +17,14 @@ "resourceType": "VF", "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136", "resourceVersion": "2.0", - "artifacts": + "category": "category", + "artifacts": [ { "artifactChecksum": "CheckSum", "artifactDescription": "Meta data for VFModule", "artifactName": "vnf-module-artifact.json", - + "artifactType": "VF_MODULES_METADATA", "artifactURL": "vnf-module-artifact.json", "artifactUUID": "VfArtifact-UUID2", @@ -40,7 +41,7 @@ "artifactUUID": "Artifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID2", - "relatedArtifact": + "relatedArtifact": [ "NestedArtifact-UUID3", "ScriptArtifact-UUID1" @@ -51,12 +52,12 @@ "artifactChecksum": "CheckSum", "artifactDescription": "Nimbus Heat ENV OAM", "artifactName": "hot-nimbus-oam_v1.0.env", - + "artifactType": "HEAT_ENV", "artifactURL": "hot-nimbus-oam_v1.0.env", "artifactUUID": "EnvArtifact-UUID2", "artifactVersion": "1.0" - + }, { @@ -68,19 +69,19 @@ "artifactURL": "nested-oam_v1.0.yaml", "artifactUUID": "NestedArtifact-UUID3", "artifactVersion": "1.0" - + }, { "artifactChecksum": "CheckSum", "artifactDescription": "Script for OAM", "artifactName": "mount_iso_script.sh", - + "artifactType": "HEAT_ARTIFACT", "artifactURL": "mount_iso_script.sh", "artifactUUID": "ScriptArtifact-UUID1", "artifactVersion": "1.0" - + }, { @@ -93,19 +94,19 @@ "artifactUUID": "VolumeArtifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "VolumeEnvArtifact-UUID1" - + }, { "artifactChecksum": "CheckSum", "artifactDescription": "Heat Env Vol for OAM", "artifactName": "hot-nimbus-oam-volumes_v1.0.env", - + "artifactType": "HEAT_ENV", "artifactURL": "hot-nimbus-oam-volumes_v1.0.env", "artifactUUID": "VolumeEnvArtifact-UUID1", "artifactVersion": "1.0" - + } ] } diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json index 7f1051d625..50fb1b7f18 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json @@ -4,6 +4,8 @@ "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132", "vfModuleModelVersion": "1.0", "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-1.group", + "vfModuleModelDescription": "vf Module Description", + "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132", "isBase": true, "artifacts": [ "Artifact-UUID1", @@ -12,6 +14,7 @@ "ScriptArtifact-UUID1", "VolumeArtifact-UUID1", "VolumeEnvArtifact-UUID1" - ] + ], + "properties": {"test":"test"} } ] \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json index ccf80ce4af..c4b113441f 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json @@ -3,12 +3,12 @@ "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134", "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f35h", "serviceVersion": "4.0", - "serviceArtifacts": + "serviceArtifacts": [ - + ], - "resources": + "resources": [ { "resourceInstanceName": "resource-1", @@ -17,13 +17,14 @@ "resourceType": "VF", "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136", "resourceVersion": "2.0", - "artifacts": + "category": "category", + "artifacts": [ { "artifactChecksum": "CheckSum", "artifactDescription": "Meta data for VFModule", "artifactName": "vnf-module-artifact.json", - + "artifactType": "VF_MODULES_METADATA", "artifactURL": "vnf-module-artifact.json", "artifactUUID": "VfArtifact-UUID2", @@ -40,7 +41,7 @@ "artifactUUID": "Artifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID2", - "relatedArtifact": + "relatedArtifact": [ "NestedArtifact-UUID3", "ScriptArtifact-UUID1" @@ -51,12 +52,12 @@ "artifactChecksum": "CheckSum", "artifactDescription": "Nimbus Heat ENV OAM", "artifactName": "hot-nimbus-oam_v1.0.env", - + "artifactType": "HEAT_ENV", "artifactURL": "hot-nimbus-oam_v1.0.env", "artifactUUID": "EnvArtifact-UUID2", "artifactVersion": "1.0" - + }, { @@ -68,19 +69,19 @@ "artifactURL": "nested-oam_v1.0.yaml", "artifactUUID": "NestedArtifact-UUID3", "artifactVersion": "1.0" - + }, { "artifactChecksum": "CheckSum", "artifactDescription": "Script for OAM", "artifactName": "mount_iso_script.sh", - + "artifactType": "HEAT_ARTIFACT", "artifactURL": "mount_iso_script.sh", "artifactUUID": "ScriptArtifact-UUID1", "artifactVersion": "1.0" - + }, { @@ -93,19 +94,19 @@ "artifactUUID": "VolumeArtifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "VolumeEnvArtifact-UUID1" - + }, { "artifactChecksum": "CheckSum", "artifactDescription": "Heat Env Vol for OAM", "artifactName": "hot-nimbus-oam-volumes_v1.0.env", - + "artifactType": "HEAT_ENV", "artifactURL": "hot-nimbus-oam-volumes_v1.0.env", "artifactUUID": "VolumeEnvArtifact-UUID1", "artifactVersion": "1.0" - + } ] } diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json index 111bf04c7e..70483dcd7f 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json @@ -4,6 +4,8 @@ "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132", "vfModuleModelVersion": "1.0", "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-1.group", + "vfModuleModelDescription": "vf Module Description", + "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132", "isBase": true, "artifacts": [ "Artifact-UUID1", @@ -13,17 +15,21 @@ "ScriptArtifact-UUID1", "VolumeArtifact-UUID1", "VolumeEnvArtifact-UUID1" - ] + ], + "properties": {"test":"test"} }, { "vfModuleModelName": "VF_RI2_G91_withArtifacts::module-1", "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f169", "vfModuleModelVersion": "1.0", "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f63g.VF_RI2_G9_withArtifacts::module-1.group", + "vfModuleModelDescription": "vf Module Description", + "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f169", "isBase": true, "artifacts": [ "HeatArtifactE2E-UUIDTest" - - ] + + ], + "properties": {"test":"test"} } ] \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json index 7ae9ff5556..4d4cb97fd2 100644 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json +++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json @@ -3,12 +3,12 @@ "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134", "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f35i", "serviceVersion": "5.0", - "serviceArtifacts": + "serviceArtifacts": [ - + ], - "resources": + "resources": [ { "resourceInstanceName": "resource-1", @@ -17,13 +17,14 @@ "resourceType": "VF", "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136", "resourceVersion": "3.0", - "artifacts": + "category": "category", + "artifacts": [ { "artifactChecksum": "CheckSum", "artifactDescription": "Meta data for VFModule", "artifactName": "vnf-module-artifact.json", - + "artifactType": "VF_MODULES_METADATA", "artifactURL": "vnf-module-artifact.json", "artifactUUID": "VfArtifact-UUID2", @@ -40,7 +41,7 @@ "artifactUUID": "Artifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID2", - "relatedArtifact": + "relatedArtifact": [ "NestedArtifact-UUID3", "ScriptArtifact-UUID1" @@ -51,12 +52,12 @@ "artifactChecksum": "CheckSum", "artifactDescription": "Nimbus Heat ENV OAM", "artifactName": "hot-nimbus-oam_v1.0.env", - + "artifactType": "HEAT_ENV", "artifactURL": "hot-nimbus-oam_v1.0.env", "artifactUUID": "EnvArtifact-UUID2", "artifactVersion": "1.0" - + }, { @@ -68,9 +69,9 @@ "artifactURL": "nested-oam_v1.0.yaml", "artifactUUID": "NestedArtifact-UUID3", "artifactVersion": "1.0" - + }, - + { "artifactChecksum": "CheckSum", "artifactDescription": "Nested PSM", @@ -80,31 +81,31 @@ "artifactURL": "nested-psm_v1.0.yaml", "artifactUUID": "NestedArtifact-UUID4", "artifactVersion": "1.0" - + }, { "artifactChecksum": "CheckSum", "artifactDescription": "Script for Nimbus", "artifactName": "cloud-nimbus.sh", - + "artifactType": "HEAT_ARTIFACT", "artifactURL": "cloud-nimbus.sh", "artifactUUID": "ScriptNimbusArtifact-UUID1", "artifactVersion": "1.0" - + }, { "artifactChecksum": "CheckSum", "artifactDescription": "Script for OAM", "artifactName": "mount_iso_script.sh", - + "artifactType": "HEAT_ARTIFACT", "artifactURL": "mount_iso_script.sh", "artifactUUID": "ScriptArtifact-UUID1", "artifactVersion": "1.0" - + }, { @@ -117,23 +118,23 @@ "artifactUUID": "VolumeArtifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "VolumeEnvArtifact-UUID1", - "relatedArtifact": + "relatedArtifact": [ "NestedArtifact-UUID4" ] - + }, { "artifactChecksum": "CheckSum", "artifactDescription": "Heat Env Vol for OAM", "artifactName": "hot-nimbus-oam-volumes_v1.0.env", - + "artifactType": "HEAT_ENV", "artifactURL": "hot-nimbus-oam-volumes_v1.0.env", "artifactUUID": "VolumeEnvArtifact-UUID1", "artifactVersion": "1.0" - + }, { "artifactChecksum": "CheckSum", diff --git a/packages/deliveries/pom.xml b/packages/deliveries/pom.xml index 61236ed5fc..704e22ff60 100644 --- a/packages/deliveries/pom.xml +++ b/packages/deliveries/pom.xml @@ -16,7 +16,7 @@ This project is responsible of the final packages OPENECOMP - MSO - http://www.onap.org/ + http://www.openecomp.org/ @@ -49,7 +49,7 @@ - + posix @@ -76,4 +76,4 @@ - + \ No newline at end of file diff --git a/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml b/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml index d412713a9d..d469d03bed 100644 --- a/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml +++ b/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml @@ -7,9 +7,9 @@ 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. @@ -29,7 +29,7 @@ false - + @@ -72,20 +72,20 @@ - mso-appc-adapter-*.war + mso-requests-db-adapter*.war - ../../adapters/mso-appc-adapter/target/ + ../../adapters/mso-requests-db-adapter/target/ artifacts - mso-requests-db-adapter*.war + mso-catalog-db-adapter*.war - ../../adapters/mso-requests-db-adapter/target/ + ../../adapters/mso-catalog-db-adapter/target/ artifacts - + asdc-controller*.war @@ -93,14 +93,21 @@ ../../asdc-controller/target/ artifacts - + - MSOGammaBPMN*.war + MSOCommonBPMN*.war - ../../bpmn/MSOGammaBPMN/target/ + ../../bpmn/MSOCommonBPMN/target/ artifacts + + + MSOInfrastructureBPMN*.war + + ../../bpmn/MSOInfrastructureBPMN/target/ + artifacts + MSOCockpit*.war @@ -108,7 +115,7 @@ ../../bpmn/MSOCockpit/target/ artifacts - + - + diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 58ac368d03..8cd65652dc 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -19,15 +19,18 @@ UTF-8 UTF-8 - ${env.GIT_NO_PROJECT} + i.e: mvn clean install -P docker -Dmso.git.url=https://gerrit.openecomp.org/r--> + ${env.GIT_NO_PROJECT} + master + mso/chef-repo + mso/mso-config ${project.version} ${project.artifactId}-${project.version} - + org.codehaus.groovy.maven gmaven-plugin @@ -56,6 +59,7 @@ + org.apache.maven.plugins maven-scm-plugin @@ -68,9 +72,9 @@ initialize - scm:git:${mso.git.url}/mso/chef-repo + scm:git:${mso.chef.git.url.prefix}/${mso.chef.git.url.suffix.chef.repo} src/main/docker/docker-files/chef-configs/chef-repo - master + ${mso.chef.git.branchname} branch true false @@ -83,9 +87,9 @@ initialize - scm:git:${mso.git.url}/mso/mso-config + scm:git:${mso.chef.git.url.prefix}/${mso.chef.git.url.suffix.chef.config} src/main/docker/docker-files/chef-configs/mso-config - master + ${mso.chef.git.branchname} branch true false @@ -140,8 +144,8 @@ mso-arquillian + ${project.docker.latesttag.version} ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} try docker-files @@ -154,8 +158,8 @@ mso + ${project.docker.latesttag.version} ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} try docker-files diff --git a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-roles.properties b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-roles.properties index de9b0aac09..cff4865c3d 100644 --- a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-roles.properties +++ b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-roles.properties @@ -29,4 +29,5 @@ InfraPortalClient=InfraPortal-Client MSOClient=MSO-Client sitecontrol=SiteControl-Client MSO=AAIEmul-Client -BPELClient=BPEL-Client \ No newline at end of file +BPELClient=BPEL-Client +SDNCClient=SDNC-Client diff --git a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-users.properties b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-users.properties index a04d22296d..f7b44d4283 100644 --- a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-users.properties +++ b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-users.properties @@ -31,4 +31,5 @@ InfraPortalClient=e5077b432685a94babe332893337f6fc MSOClient=72bc85031ae67afe67014c7663ae1033 sitecontrol=9a3a360d86758f69ec9508725c017335 MSO=a05cb60a04f41f750ce1fc60a2633534 -BPELClient=f2b4ce8ae1964050c0ad7e69bd88fd62 \ No newline at end of file +BPELClient=f2b4ce8ae1964050c0ad7e69bd88fd62 +SDNCClient=3c98dfba582d79948496b319e3edcb4b diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/automated-tests/create_mso_db-tests.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/automated-tests/create_mso_db-tests.sql index e622bf34ee..146ad01605 100644 --- a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/automated-tests/create_mso_db-tests.sql +++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/automated-tests/create_mso_db-tests.sql @@ -15,26 +15,35 @@ FLUSH PRIVILEGES; LOCK TABLES `NETWORK_RESOURCE` WRITE; /*!40000 ALTER TABLE `NETWORK_RESOURCE` DISABLE KEYS */; /*!40000 ALTER TABLE `NETWORK_RESOURCE` ENABLE KEYS */; -insert into NETWORK_RESOURCE (id, NETWORK_TYPE, VERSION_STR, ORCHESTRATION_MODE ,DESCRIPTION, TEMPLATE_ID, NEUTRON_NETWORK_TYPE) values -(1, "vlan",'1',"NEUTRON","Cool network",1,"BASIC"); +insert into NETWORK_RESOURCE (id, NETWORK_TYPE, VERSION_STR, ORCHESTRATION_MODE ,DESCRIPTION, TEMPLATE_ID, NEUTRON_NETWORK_TYPE, AIC_VERSION_MIN) values +(1, "vlan",'1',"NEUTRON","Cool network",1,"BASIC","0"); UNLOCK TABLES; LOCK TABLES `NETWORK_RECIPE` WRITE; /*!40000 ALTER TABLE `NETWORK_RECIPE` DISABLE KEYS */; -INSERT INTO `NETWORK_RECIPE`(`NETWORK_TYPE`, `ACTION`, `VERSION_STR`, `DESCRIPTION`, `ORCHESTRATION_URI`, `NETWORK_PARAM_XSD`, `RECIPE_TIMEOUT`, `SERVICE_TYPE`) VALUES +INSERT INTO `NETWORK_RECIPE`(`NETWORK_TYPE`, `ACTION`, `VERSION_STR`, `DESCRIPTION`, `ORCHESTRATION_URI`, `NETWORK_PARAM_XSD`, `RECIPE_TIMEOUT`, `SERVICE_TYPE`) VALUES ('vlan','CREATE','1',NULL,'/active-bpel/services/REST/CreateNetwork',NULL,180,NULL), ('vlan','DELETE','1',NULL,'/active-bpel/services/REST/DeleteNetwork',NULL,180,NULL); /*!40000 ALTER TABLE `NETWORK_RECIPE` ENABLE KEYS */; UNLOCK TABLES; +LOCK TABLES `VNF_RECIPE` WRITE; INSERT INTO `VNF_RECIPE`(`ID`, `VNF_TYPE`, `ACTION`, `VERSION_STR`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `SERVICE_TYPE`) VALUES (100,'VPE','CREATE','1','','/active-bpel/services/REST/CreateGenericVNF','',180,'SDN-ETHERNET-INTERNET'), (101,'VPE','DELETE','1','','/active-bpel/services/REST/DeleteGenericVNF','',180,'SDN-ETHERNET-INTERNET'); +UNLOCK TABLES; +LOCK TABLES `VF_MODULE` WRITE; INSERT INTO `VF_MODULE`(`ID`, `TYPE`, `ASDC_SERVICE_MODEL_VERSION`, `MODEL_NAME`, `MODEL_VERSION`, `IS_BASE`, `VNF_RESOURCE_ID`) VALUES -(100,'dns-servicetest/DNSResource-1::VF_DNS::module-1','1.0','VF_DNS::module-1','1.0','1','7'); +(100,'dns-servicetest/DNSResource-1::VF_DNS::module-1','1.0','VF_DNS::module-1','1.0','1','7'), +(101,'dns-servicetest/DNSResource-1::Mog111..mog_psm..module-1','1.0','Mog111..mog_psm..module-1','1.0','1','7'); +UNLOCK TABLES; + +LOCK TABLES `VNF_RESOURCE` WRITE; +INSERT INTO `VNF_RESOURCE`(`ID`, `VNF_TYPE`, `ASDC_SERVICE_MODEL_VERSION`, `ORCHESTRATION_MODE`, `MODEL_VERSION`) VALUES +(100,'dns-servicetest/DNSResource-1','1.0','VF_DNS::module-1','1.0'); +UNLOCK TABLES; -DELETE FROM VNF_RESOURCE; DELETE FROM HEAT_TEMPLATE_PARAMS; DELETE FROM HEAT_TEMPLATE; DELETE FROM HEAT_ENVIRONMENT; diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql index e2611b358e..d7fc2b2366 100644 --- a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql +++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql @@ -1,6 +1,5 @@ -SOURCE ../../camunda/mysql_engine_7.3.0.sql -SOURCE ../../camunda/mysql_identity_7.3.0.sql -SOURCE ../../camunda/mysql_updates_7.3.0.sql +SOURCE ../../camunda/mariadb_engine_7.6.0.sql +SOURCE ../../camunda/mariadb_identity_7.6.0.sql -- -- Create an admin user automatically for the cockpit @@ -33,6 +32,7 @@ USE `mso_catalog`; SOURCE ../../main-schemas/MySQL-Catalog-schema.sql SOURCE ../../sub-sql-files/catalog_timestamp_mso_db.sql +SOURCE ../../sub-sql-files/catalog_add_constraints.sql LOCK TABLES `NETWORK_RECIPE` WRITE; /*!40000 ALTER TABLE `NETWORK_RECIPE` DISABLE KEYS */; @@ -83,9 +83,9 @@ INSERT INTO `VNF_COMPONENTS_RECIPE` /*!40000 ALTER TABLE `VNF_COMPONENTS_RECIPE` ENABLE KEYS */; UNLOCK TABLES; -INSERT INTO service (id, SERVICE_NAME, VERSION_STR, DESCRIPTION) VALUES ('4', 'VID_DEFAULT', '1.0', 'Default service for VID to use for infra APIH orchestration'); -INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'createInstance', '1', 'VID_DEFAULT recipe to create service-instance if no custom BPMN flow is found', '/mso/async/services/CreateServiceInstanceInfra', '180'); -INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete service-instance if no custom BPMN flow is found', '/mso/async/services/DeleteServiceInstanceInfra', '180'); +INSERT INTO service (id, SERVICE_NAME, VERSION_STR, DESCRIPTION, SERVICE_NAME_VERSION_ID) VALUES ('4', 'VID_DEFAULT', '1.0', 'Default service for VID to use for infra APIH orchestration', 'MANUAL_RECORD'); +INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'createInstance', '1', 'VID_DEFAULT recipe to create service-instance if no custom BPMN flow is found', '/mso/async/services/CreateServiceInstance', '180'); +INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete service-instance if no custom BPMN flow is found', '/mso/async/services/DelServiceInstance', '180'); INSERT INTO vnf_recipe (VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'createInstance', '1', 'VID_DEFAULT recipe to create VNF if no custom BPMN flow is found', '/mso/async/services/CreateVnfInfra', '180'); INSERT INTO vnf_recipe (VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete VNF if no custom BPMN flow is found', '/mso/async/services/DeleteVnfInfra', '180'); INSERT INTO vnf_components_recipe (VNF_TYPE, VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_ID) VALUES (NULL, 'volumeGroup', 'createInstance', '1', 'VID_DEFAULT recipe to create volume-group if no custom BPMN flow is found', '/mso/async/services/CreateVfModuleVolumeInfraV1', '180', 'VID_DEFAULT'); @@ -94,6 +94,6 @@ INSERT INTO vnf_components_recipe (VNF_TYPE, VNF_COMPONENT_TYPE, ACTION, VERSION INSERT INTO vnf_components_recipe (VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_ID) VALUES ('vfModule', 'createInstance', '1', 'VID_DEFAULT recipe to create vf-module if no custom BPMN flow is found', '/mso/async/services/CreateVfModuleInfra', '180', 'VID_DEFAULT'); INSERT INTO vnf_components_recipe (VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_ID) VALUES ('vfModule', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete vf-module if no custom BPMN flow is found', '/mso/async/services/DeleteVfModuleInfra', '180', 'VID_DEFAULT'); INSERT INTO vnf_components_recipe (VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_ID) VALUES ('vfModule', 'updateInstance', '1', 'VID_DEFAULT recipe to update vf-module if no custom BPMN flow is found', '/mso/async/services/UpdateVfModuleInfra', '180', 'VID_DEFAULT'); -INSERT INTO network_recipe (NETWORK_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'createInstance', '1.0', 'VID_DEFAULT recipe to create network if no custom BPMN flow is found', '/mso/async/services/CreateNetworkInstanceInfra', '180'); +INSERT INTO network_recipe (NETWORK_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'createInstance', '1.0', 'VID_DEFAULT recipe to create network if no custom BPMN flow is found', '/mso/async/services/CreateNetworkInstance', '180'); INSERT INTO network_recipe (NETWORK_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'updateInstance', '1.0', 'VID_DEFAULT recipe to update network if no custom BPMN flow is found', '/mso/async/services/UpdateNetworkInstanceInfra', '180'); -INSERT INTO network_recipe (NETWORK_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'deleteInstance', '1.0', 'VID_DEFAULT recipe to delete network if no custom BPMN flow is found', '/mso/async/services/DeleteNetworkInstanceInfra', '180'); \ No newline at end of file +INSERT INTO network_recipe (NETWORK_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'deleteInstance', '1.0', 'VID_DEFAULT recipe to delete network if no custom BPMN flow is found', '/mso/async/services/DeleteNetworkInstance', '180'); \ No newline at end of file diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.6.0.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.6.0.sql new file mode 100644 index 0000000000..f40f3dc3de --- /dev/null +++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_engine_7.6.0.sql @@ -0,0 +1,1071 @@ +# Start of Statements added for MSO +DROP DATABASE IF EXISTS `camundabpmn`; + +CREATE DATABASE /*!32312 IF NOT EXISTS*/ `camundabpmn` /*!40100 DEFAULT CHARACTER SET latin1 */; + +USE `camundabpmn`; + +# DROP USER IF EXISTS 'camunda'; +delete from mysql.user where User='camunda'; +CREATE USER 'camunda'; +GRANT ALL on camundabpmn.* to 'camunda' identified by 'camunda123' with GRANT OPTION; +FLUSH PRIVILEGES; +# End of Statements added for MSO + +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); + +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), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +create table ACT_RE_DEPLOYMENT ( + ID_ varchar(64), + NAME_ varchar(255), + DEPLOY_TIME_ timestamp(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, + 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_ timestamp(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), + DUEDATE_ timestamp(3) NULL, + REPEAT_ varchar(255), + 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), + 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), + 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), + 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_ timestamp(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), + CASE_EXECUTION_ID_ varchar(64), + CASE_INST_ID_ varchar(64), + TASK_ID_ varchar(64), + BYTEARRAY_ID_ varchar(64), + DOUBLE_ double, + LONG_ bigint, + TEXT_ varchar(4000), + 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(64), + CONFIGURATION_ varchar(255), + CREATED_ timestamp(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_ timestamp(3) not null, + INCIDENT_MSG_ varchar(4000), + INCIDENT_TYPE_ varchar(255) not null, + EXECUTION_ID_ varchar(64), + 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(64), + PERMS_ integer, + 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_ timestamp(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_ timestamp(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), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +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_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_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_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_); + +-- 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_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_); +-- 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), + 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_); + +-- 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_); +-- 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), + 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_); +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), + DURATION_ bigint, + START_USER_ID_ varchar(255), + START_ACT_ID_ varchar(255), + END_ACT_ID_ varchar(255), + SUPER_PROCESS_INSTANCE_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, + 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(64), + START_TIME_ datetime(3) not null, + END_TIME_ datetime(3), + DURATION_ bigint, + ACT_INST_STATE_ integer, + SEQUENCE_COUNTER_ bigint, + TENANT_ID_ varchar(64), + 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), + 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), + 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), + 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), + REV_ integer, + BYTEARRAY_ID_ varchar(64), + DOUBLE_ double, + LONG_ bigint, + TEXT_ varchar(4000), + TEXT2_ varchar(4000), + TENANT_ID_ varchar(64), + 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), + 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(4000), + TEXT2_ varchar(4000), + SEQUENCE_COUNTER_ bigint, + TENANT_ID_ varchar(64), + 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), + PROC_DEF_ID_ varchar(64), + OPERATION_TYPE_ varchar(64), + ASSIGNER_ID_ varchar(64), + PROC_DEF_KEY_ varchar(255), + TENANT_ID_ varchar(64), + 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), + PROC_INST_ID_ varchar(64), + ACTION_ varchar(255), + MESSAGE_ varchar(4000), + FULL_MSG_ LONGBLOB, + TENANT_ID_ varchar(64), + 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), + PROC_INST_ID_ varchar(64), + URL_ varchar(4000), + CONTENT_ID_ varchar(64), + TENANT_ID_ varchar(64), + 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), + 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), + 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), + 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), + CAUSE_INCIDENT_ID_ varchar(64), + ROOT_CAUSE_INCIDENT_ID_ varchar(64), + CONFIGURATION_ varchar(255), + INCIDENT_STATE_ integer, + TENANT_ID_ varchar(64), + JOB_DEF_ID_ varchar(64), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +create table ACT_HI_JOB_LOG ( + ID_ varchar(64) not null, + TIMESTAMP_ timestamp(3) not null, + JOB_ID_ varchar(64) not null, + JOB_DUEDATE_ timestamp(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), + 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), + 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), + START_TIME_ datetime(3) not null, + END_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_ACT_INST_START on ACT_HI_ACTINST(START_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_, 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_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_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_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_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_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_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_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 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_); +-- 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, + COLLECT_VALUE_ double, + USER_ID_ varchar(255), + ROOT_DEC_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(4000), + TEXT2_ varchar(4000), + TENANT_ID_ varchar(64), + 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(4000), + TEXT2_ varchar(4000), + TENANT_ID_ varchar(64), + 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_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_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_); diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_identity_7.6.0.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_identity_7.6.0.sql new file mode 100644 index 0000000000..e4a81e45f4 --- /dev/null +++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mariadb_identity_7.6.0.sql @@ -0,0 +1,88 @@ +# Start of statements added for MSO +USE `camundabpmn`; +# End of statements added for MSO + +create table ACT_ID_GROUP ( + ID_ varchar(64), + REV_ integer, + NAME_ varchar(255), + TYPE_ varchar(255), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +create table ACT_ID_MEMBERSHIP ( + USER_ID_ varchar(64), + GROUP_ID_ varchar(64), + primary key (USER_ID_, GROUP_ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +create table ACT_ID_USER ( + ID_ varchar(64), + REV_ integer, + FIRST_ varchar(255), + LAST_ varchar(255), + EMAIL_ varchar(255), + PWD_ varchar(255), + PICTURE_ID_ varchar(64), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +create table ACT_ID_INFO ( + ID_ varchar(64), + REV_ integer, + USER_ID_ varchar(64), + TYPE_ varchar(64), + KEY_ varchar(255), + VALUE_ varchar(255), + PASSWORD_ LONGBLOB, + PARENT_ID_ varchar(255), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +create table ACT_ID_TENANT ( + ID_ varchar(64), + REV_ integer, + NAME_ varchar(255), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +create table ACT_ID_TENANT_MEMBER ( + ID_ varchar(64) not null, + TENANT_ID_ varchar(64) not null, + USER_ID_ varchar(64), + GROUP_ID_ varchar(64), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +alter table ACT_ID_MEMBERSHIP + add constraint ACT_FK_MEMB_GROUP + foreign key (GROUP_ID_) + references ACT_ID_GROUP (ID_); + +alter table ACT_ID_MEMBERSHIP + add constraint ACT_FK_MEMB_USER + foreign key (USER_ID_) + references ACT_ID_USER (ID_); + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_UNIQ_TENANT_MEMB_USER + unique (TENANT_ID_, USER_ID_); + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_UNIQ_TENANT_MEMB_GROUP + unique (TENANT_ID_, GROUP_ID_); + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_FK_TENANT_MEMB + foreign key (TENANT_ID_) + references ACT_ID_TENANT (ID_); + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_FK_TENANT_MEMB_USER + foreign key (USER_ID_) + references ACT_ID_USER (ID_); + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_FK_TENANT_MEMB_GROUP + foreign key (GROUP_ID_) + references ACT_ID_GROUP (ID_); diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mysql_updates_7.3.0_to_7.6.0.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mysql_updates_7.3.0_to_7.6.0.sql new file mode 100644 index 0000000000..cd607aa059 --- /dev/null +++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/camunda/mysql_updates_7.3.0_to_7.6.0.sql @@ -0,0 +1,699 @@ +# MSO updates to the default camunda schema. +USE `camundabpmn`; + +ALTER TABLE ACT_RU_METER_LOG + ADD REPORTER_ varchar(255); + +-- job prioritization -- + +ALTER TABLE ACT_RU_JOB + ADD PRIORITY_ bigint NOT NULL + DEFAULT 0; + +ALTER TABLE ACT_RU_JOBDEF + ADD JOB_PRIORITY_ bigint; + +ALTER TABLE ACT_HI_JOB_LOG + ADD JOB_PRIORITY_ bigint NOT NULL + DEFAULT 0; + +-- 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), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +-- create unique constraint on ACT_RE_DECISION_DEF -- +alter table ACT_RE_DECISION_DEF + add constraint ACT_UNIQ_DECISION_DEF + unique (KEY_,VERSION_); + +-- case sentry part source -- + +ALTER TABLE ACT_RU_CASE_SENTRY_PART + ADD SOURCE_ varchar(255); + +-- 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 not null, + COLLECT_VALUE_ double, + 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) NOT NULL, + CLAUSE_NAME_ varchar(255), + VAR_TYPE_ varchar(100), + BYTEARRAY_ID_ varchar(64), + DOUBLE_ double, + LONG_ bigint, + TEXT_ LONGBLOB NULL, + TEXT2_ LONGBLOB NULL, + 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) NOT NULL, + CLAUSE_NAME_ varchar(255), + RULE_ID_ varchar(64) NOT NULL, + RULE_ORDER_ integer, + VAR_NAME_ varchar(255), + VAR_TYPE_ varchar(100), + BYTEARRAY_ID_ varchar(64), + DOUBLE_ double, + LONG_ bigint, + TEXT_ LONGBLOB NULL, + TEXT2_ LONGBLOB NULL, + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +-- create indexes for historic decision tables +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_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_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_); + +-- add grant authorization for group camunda-admin: +INSERT INTO + ACT_RU_AUTHORIZATION (ID_, TYPE_, GROUP_ID_, RESOURCE_TYPE_, RESOURCE_ID_, PERMS_, REV_) +VALUES + ('camunda-admin-grant-decision-definition', 1, 'camunda-admin', 10, '*', 2147483647, 1); + +-- external tasks -- + +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), + LOCK_EXP_TIME_ timestamp 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), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +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_EXT_TASK_TOPIC on ACT_RU_EXT_TASK(TOPIC_NAME_); + +-- deployment -- + +ALTER TABLE ACT_RE_DEPLOYMENT + ADD SOURCE_ varchar(255); + +ALTER TABLE ACT_HI_OP_LOG + ADD DEPLOYMENT_ID_ varchar(64); + +-- job suspension state + +ALTER TABLE ACT_RU_JOB + MODIFY COLUMN SUSPENSION_STATE_ integer + DEFAULT 1; + + -- relevant for jobs created in Camunda 7.0 +UPDATE ACT_RU_JOB + SET SUSPENSION_STATE_ = 1 + WHERE SUSPENSION_STATE_ IS NULL; + +ALTER TABLE ACT_RU_JOB + MODIFY COLUMN SUSPENSION_STATE_ integer + NOT NULL DEFAULT 1; + + +-- mariadb_engine_7.4_patch_7.4.5_to_7.4.6 +-- INCREASE process def key column size https://app.camunda.com/jira/browse/CAM-4328 -- +alter table ACT_RU_JOB + MODIFY COLUMN PROCESS_DEF_KEY_ varchar(255); + +-- mariadb_engine_7.4_to_7.5 +-- set datetime precision -- + +ALTER TABLE ACT_HI_CASEINST + MODIFY COLUMN CREATE_TIME_ datetime(3) not null; + +ALTER TABLE ACT_HI_CASEINST + MODIFY COLUMN CLOSE_TIME_ datetime(3); + +ALTER TABLE ACT_HI_CASEACTINST + MODIFY COLUMN CREATE_TIME_ datetime(3) not null; + +ALTER TABLE ACT_HI_CASEACTINST + MODIFY COLUMN END_TIME_ datetime(3); + +ALTER TABLE ACT_HI_DECINST + MODIFY COLUMN EVAL_TIME_ datetime(3) not null; + +ALTER TABLE ACT_RU_TASK + MODIFY COLUMN DUE_DATE_ datetime(3); + +ALTER TABLE ACT_RU_TASK + MODIFY COLUMN FOLLOW_UP_DATE_ datetime(3); + +ALTER TABLE ACT_HI_PROCINST + MODIFY COLUMN START_TIME_ datetime(3) not null; + +ALTER TABLE ACT_HI_PROCINST + MODIFY COLUMN END_TIME_ datetime(3); + +ALTER TABLE ACT_HI_ACTINST + MODIFY COLUMN START_TIME_ datetime(3) not null; + +ALTER TABLE ACT_HI_ACTINST + MODIFY COLUMN END_TIME_ datetime(3); + +ALTER TABLE ACT_HI_TASKINST + MODIFY COLUMN START_TIME_ datetime(3) not null; + +ALTER TABLE ACT_HI_TASKINST + MODIFY COLUMN END_TIME_ datetime(3); + +ALTER TABLE ACT_HI_TASKINST + MODIFY COLUMN DUE_DATE_ datetime(3); + +ALTER TABLE ACT_HI_TASKINST + MODIFY COLUMN FOLLOW_UP_DATE_ datetime(3); + +ALTER TABLE ACT_HI_DETAIL + MODIFY COLUMN TIME_ datetime(3) not null; + +ALTER TABLE ACT_HI_COMMENT + MODIFY COLUMN TIME_ datetime(3) not null; + +-- set timestamp precision -- + +ALTER TABLE ACT_RE_DEPLOYMENT + MODIFY COLUMN DEPLOY_TIME_ timestamp(3); + +ALTER TABLE ACT_RU_JOB + MODIFY COLUMN LOCK_EXP_TIME_ timestamp(3) NULL; + +ALTER TABLE ACT_RU_JOB + MODIFY COLUMN DUEDATE_ timestamp(3) NULL; + +ALTER TABLE ACT_RU_TASK + MODIFY COLUMN CREATE_TIME_ timestamp(3); + +ALTER TABLE ACT_RU_EVENT_SUBSCR + MODIFY COLUMN CREATED_ timestamp(3) NOT NULL; + +ALTER TABLE ACT_RU_INCIDENT + MODIFY COLUMN INCIDENT_TIMESTAMP_ timestamp(3) NOT NULL; + +ALTER TABLE ACT_RU_METER_LOG + MODIFY COLUMN TIMESTAMP_ timestamp(3) NOT NULL; + +ALTER TABLE ACT_RU_EXT_TASK + MODIFY COLUMN LOCK_EXP_TIME_ timestamp(3) NULL; + +ALTER TABLE ACT_HI_OP_LOG + MODIFY COLUMN TIMESTAMP_ timestamp(3) NOT NULL; + +ALTER TABLE ACT_HI_INCIDENT + MODIFY COLUMN CREATE_TIME_ timestamp(3) NOT NULL; + +ALTER TABLE ACT_HI_INCIDENT + MODIFY COLUMN END_TIME_ timestamp(3) NULL; + +ALTER TABLE ACT_HI_JOB_LOG + MODIFY COLUMN TIMESTAMP_ timestamp(3) NOT NULL; + +ALTER TABLE ACT_HI_JOB_LOG + MODIFY COLUMN JOB_DUEDATE_ timestamp(3) NULL; + +-- semantic version -- + +ALTER TABLE ACT_RE_PROCDEF + ADD VERSION_TAG_ varchar(64); + +create index ACT_IDX_PROCDEF_VER_TAG on ACT_RE_PROCDEF(VERSION_TAG_); + +-- tenant id -- + +ALTER TABLE ACT_RE_DEPLOYMENT + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_DEPLOYMENT_TENANT_ID on ACT_RE_DEPLOYMENT(TENANT_ID_); + +ALTER TABLE ACT_RE_PROCDEF + ADD TENANT_ID_ varchar(64); + +ALTER TABLE ACT_RE_PROCDEF + DROP INDEX ACT_UNIQ_PROCDEF; + +create index ACT_IDX_PROCDEF_TENANT_ID ON ACT_RE_PROCDEF(TENANT_ID_); + +ALTER TABLE ACT_RU_EXECUTION + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_EXEC_TENANT_ID on ACT_RU_EXECUTION(TENANT_ID_); + +ALTER TABLE ACT_RU_TASK + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_TASK_TENANT_ID on ACT_RU_TASK(TENANT_ID_); + +ALTER TABLE ACT_RU_VARIABLE + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_VARIABLE_TENANT_ID on ACT_RU_VARIABLE(TENANT_ID_); + +ALTER TABLE ACT_RU_EVENT_SUBSCR + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_EVENT_SUBSCR_TENANT_ID on ACT_RU_EVENT_SUBSCR(TENANT_ID_); + +ALTER TABLE ACT_RU_JOB + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_JOB_TENANT_ID on ACT_RU_JOB(TENANT_ID_); + +ALTER TABLE ACT_RU_JOBDEF + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_JOBDEF_TENANT_ID on ACT_RU_JOBDEF(TENANT_ID_); + +ALTER TABLE ACT_RU_INCIDENT + ADD TENANT_ID_ varchar(64); + +ALTER TABLE ACT_RU_IDENTITYLINK + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_INC_TENANT_ID on ACT_RU_INCIDENT(TENANT_ID_); + +ALTER TABLE ACT_RU_EXT_TASK + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_EXT_TASK_TENANT_ID on ACT_RU_EXT_TASK(TENANT_ID_); + +ALTER TABLE ACT_RE_DECISION_DEF + DROP INDEX ACT_UNIQ_DECISION_DEF; + +ALTER TABLE ACT_RE_DECISION_DEF + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_DEC_DEF_TENANT_ID on ACT_RE_DECISION_DEF(TENANT_ID_); + +ALTER TABLE ACT_RE_CASE_DEF + DROP INDEX ACT_UNIQ_CASE_DEF; + +ALTER TABLE ACT_RE_CASE_DEF + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_CASE_DEF_TENANT_ID on ACT_RE_CASE_DEF(TENANT_ID_); + +ALTER TABLE ACT_GE_BYTEARRAY + ADD TENANT_ID_ varchar(64); + +ALTER TABLE ACT_RU_CASE_EXECUTION + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_CASE_EXEC_TENANT_ID on ACT_RU_CASE_EXECUTION(TENANT_ID_); + +ALTER TABLE ACT_RU_CASE_SENTRY_PART + ADD TENANT_ID_ varchar(64); + +-- user on historic decision instance -- + +ALTER TABLE ACT_HI_DECINST + ADD USER_ID_ varchar(255); + +-- tenant id on history -- + +ALTER TABLE ACT_HI_PROCINST + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_PRO_INST_TENANT_ID on ACT_HI_PROCINST(TENANT_ID_); + +ALTER TABLE ACT_HI_ACTINST + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_ACT_INST_TENANT_ID on ACT_HI_ACTINST(TENANT_ID_); + +ALTER TABLE ACT_HI_TASKINST + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_TASK_INST_TENANT_ID on ACT_HI_TASKINST(TENANT_ID_); + +ALTER TABLE ACT_HI_VARINST + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_VAR_INST_TENANT_ID on ACT_HI_VARINST(TENANT_ID_); + +ALTER TABLE ACT_HI_DETAIL + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_DETAIL_TENANT_ID on ACT_HI_DETAIL(TENANT_ID_); + +ALTER TABLE ACT_HI_INCIDENT + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_INCIDENT_TENANT_ID on ACT_HI_INCIDENT(TENANT_ID_); + +ALTER TABLE ACT_HI_JOB_LOG + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_JOB_LOG_TENANT_ID on ACT_HI_JOB_LOG(TENANT_ID_); + +ALTER TABLE ACT_HI_COMMENT + ADD TENANT_ID_ varchar(64); + +ALTER TABLE ACT_HI_ATTACHMENT + ADD TENANT_ID_ varchar(64); + +ALTER TABLE ACT_HI_OP_LOG + ADD TENANT_ID_ varchar(64); + +ALTER TABLE ACT_HI_DEC_IN + ADD TENANT_ID_ varchar(64); + +ALTER TABLE ACT_HI_DEC_OUT + ADD TENANT_ID_ varchar(64); + +ALTER TABLE ACT_HI_DECINST + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_DEC_INST_TENANT_ID on ACT_HI_DECINST(TENANT_ID_); + +ALTER TABLE ACT_HI_CASEINST + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_CAS_I_TENANT_ID on ACT_HI_CASEINST(TENANT_ID_); + +ALTER TABLE ACT_HI_CASEACTINST + ADD TENANT_ID_ varchar(64); + +create index ACT_IDX_HI_CAS_A_I_TENANT_ID on ACT_HI_CASEACTINST(TENANT_ID_); + +-- AUTHORIZATION -- + +-- add grant authorizations for group camunda-admin: +INSERT INTO + ACT_RU_AUTHORIZATION (ID_, TYPE_, GROUP_ID_, RESOURCE_TYPE_, RESOURCE_ID_, PERMS_, REV_) +VALUES + ('camunda-admin-grant-tenant', 1, 'camunda-admin', 11, '*', 2147483647, 1), + ('camunda-admin-grant-tenant-membership', 1, 'camunda-admin', 12, '*', 2147483647, 1), + ('camunda-admin-grant-batch', 1, 'camunda-admin', 13, '*', 2147483647, 1); + +-- tenant table + +create table ACT_ID_TENANT ( + ID_ varchar(64), + REV_ integer, + NAME_ varchar(255), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +create table ACT_ID_TENANT_MEMBER ( + ID_ varchar(64) not null, + TENANT_ID_ varchar(64) not null, + USER_ID_ varchar(64), + GROUP_ID_ varchar(64), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_UNIQ_TENANT_MEMB_USER + unique (TENANT_ID_, USER_ID_); + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_UNIQ_TENANT_MEMB_GROUP + unique (TENANT_ID_, GROUP_ID_); + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_FK_TENANT_MEMB + foreign key (TENANT_ID_) + references ACT_ID_TENANT (ID_); + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_FK_TENANT_MEMB_USER + foreign key (USER_ID_) + references ACT_ID_USER (ID_); + +alter table ACT_ID_TENANT_MEMBER + add constraint ACT_FK_TENANT_MEMB_GROUP + foreign key (GROUP_ID_) + references ACT_ID_GROUP (ID_); + +-- BATCH -- + +-- remove not null from job definition table -- +alter table ACT_RU_JOBDEF + modify PROC_DEF_ID_ varchar(64), + modify PROC_DEF_KEY_ varchar(255), + modify ACT_ID_ varchar(255); + +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), + 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), + START_TIME_ datetime(3) not null, + END_TIME_ datetime(3), + 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), + PROC_DEF_ID_ varchar(64), + OPERATION_TYPE_ varchar(64), + ASSIGNER_ID_ varchar(64), + PROC_DEF_KEY_ varchar(255), + TENANT_ID_ varchar(64), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + +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_JOB_JOB_DEF_ID on ACT_RU_JOB(JOB_DEF_ID_); +create index ACT_IDX_HI_JOB_LOG_JOB_DEF_ID on ACT_HI_JOB_LOG(JOB_DEF_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_); + +-- TASK PRIORITY -- + +ALTER TABLE ACT_RU_EXT_TASK + ADD PRIORITY_ bigint NOT NULL DEFAULT 0; + +create index ACT_IDX_EXT_TASK_PRIORITY ON ACT_RU_EXT_TASK(PRIORITY_); + +-- HI OP PROC INDECIES -- + +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_); + +-- JOB_DEF_ID_ on INCIDENTS -- +ALTER TABLE ACT_RU_INCIDENT + ADD JOB_DEF_ID_ varchar(64); + +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_HI_INCIDENT + ADD JOB_DEF_ID_ varchar(64); + +-- BATCH_ID_ on ACT_HI_OP_LOG -- +ALTER TABLE ACT_HI_OP_LOG + ADD BATCH_ID_ varchar(64); + + -- add indexes on PROC_DEF_KEY_ columns in history tables CAM-6679 +create index ACT_IDX_HI_ACT_INST_PROC_DEF_KEY on ACT_HI_ACTINST(PROC_DEF_KEY_); +create index ACT_IDX_HI_DETAIL_PROC_DEF_KEY on ACT_HI_DETAIL(PROC_DEF_KEY_); +create index ACT_IDX_HI_IDENT_LNK_PROC_DEF_KEY on ACT_HI_IDENTITYLINK(PROC_DEF_KEY_); +create index ACT_IDX_HI_INCIDENT_PROC_DEF_KEY on ACT_HI_INCIDENT(PROC_DEF_KEY_); +create index ACT_IDX_HI_JOB_LOG_PROC_DEF_KEY on ACT_HI_JOB_LOG(PROCESS_DEF_KEY_); +create index ACT_IDX_HI_PRO_INST_PROC_DEF_KEY on ACT_HI_PROCINST(PROC_DEF_KEY_); +create index ACT_IDX_HI_TASK_INST_PROC_DEF_KEY on ACT_HI_TASKINST(PROC_DEF_KEY_); +create index ACT_IDX_HI_VAR_INST_PROC_DEF_KEY on ACT_HI_VARINST(PROC_DEF_KEY_); + +-- 7.5.8 to 7.6.2 upgrade +-- AUTHORIZATION -- + +-- add grant authorizations for group camunda-admin: +INSERT INTO + ACT_RU_AUTHORIZATION (ID_, TYPE_, GROUP_ID_, RESOURCE_TYPE_, RESOURCE_ID_, PERMS_, REV_) +VALUES + ('camunda-admin-grant-drd', 1, 'camunda-admin', 14, '*', 2147483647, 1); + +-- decision requirements definition -- + +ALTER TABLE ACT_RE_DECISION_DEF + ADD DEC_REQ_ID_ varchar(64); + +ALTER TABLE ACT_RE_DECISION_DEF + ADD DEC_REQ_KEY_ varchar(255); + +ALTER TABLE ACT_RU_CASE_SENTRY_PART + ADD VARIABLE_EVENT_ varchar(255); + +ALTER TABLE ACT_RU_CASE_SENTRY_PART + ADD VARIABLE_NAME_ varchar(255); + +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_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_); + +ALTER TABLE ACT_HI_DECINST + ADD ROOT_DEC_INST_ID_ varchar(64); + +ALTER TABLE ACT_HI_DECINST + ADD DEC_REQ_ID_ varchar(64); + +ALTER TABLE ACT_HI_DECINST + ADD DEC_REQ_KEY_ varchar(255); + +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_); + +-- remove not null from ACT_HI_DEC tables -- +alter table ACT_HI_DEC_OUT + modify CLAUSE_ID_ varchar(64), + modify RULE_ID_ varchar(64); + +alter table ACT_HI_DEC_IN + modify CLAUSE_ID_ varchar(64); + +-- CAM-5914 +create index ACT_IDX_JOB_EXECUTION_ID on ACT_RU_JOB(EXECUTION_ID_); + +ALTER TABLE ACT_RU_EXT_TASK + ADD ERROR_DETAILS_ID_ varchar(64); + +alter table ACT_RU_EXT_TASK + add constraint ACT_FK_EXT_TASK_ERROR_DETAILS + foreign key (ERROR_DETAILS_ID_) + references ACT_GE_BYTEARRAY (ID_); + +ALTER TABLE ACT_HI_PROCINST + ADD STATE_ varchar(255); + +update ACT_HI_PROCINST set STATE_ = 'ACTIVE' where END_TIME_ is null; +update ACT_HI_PROCINST set STATE_ = 'COMPLETED' where END_TIME_ is not null; + +-- CAM-6725 +ALTER TABLE ACT_RU_METER_LOG + ADD MILLISECONDS_ bigint DEFAULT 0; + +alter table ACT_RU_METER_LOG + modify TIMESTAMP_ TIMESTAMP(3); + +CREATE INDEX ACT_IDX_METER_LOG_MS ON ACT_RU_METER_LOG(MILLISECONDS_); +CREATE INDEX ACT_IDX_METER_LOG_REPORT ON ACT_RU_METER_LOG(NAME_, REPORTER_, MILLISECONDS_); +CREATE INDEX ACT_IDX_METER_LOG_NAME_MS ON ACT_RU_METER_LOG(NAME_, MILLISECONDS_); + +-- old metric timestamp column +CREATE INDEX ACT_IDX_METER_LOG_TIME ON ACT_RU_METER_LOG(TIMESTAMP_); + +-- CAM-6938 +create index ACT_IDX_JOB_HANDLER on ACT_RU_JOB(HANDLER_TYPE_(100),HANDLER_CFG_(155)); \ No newline at end of file diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_add_constraints.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_add_constraints.sql new file mode 100644 index 0000000000..a5e9834de2 --- /dev/null +++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_add_constraints.sql @@ -0,0 +1,45 @@ +USE `mso_catalog`; + +ALTER TABLE `mso_catalog`.`service_to_allotted_resources` + ADD INDEX `fk_service_to_allotted_resources__service_model_uuid_idx` (`SERVICE_MODEL_UUID` ASC), + ADD INDEX `fk_service_to_allotted_resources__allotted_resource_customiz_idx` (`AR_MODEL_CUSTOMIZATION_UUID` ASC), + ADD CONSTRAINT `fk_service_to_allotted_resources__service__service_name_ver_id` + FOREIGN KEY (`SERVICE_MODEL_UUID`) + REFERENCES `mso_catalog`.`service` (`SERVICE_NAME_VERSION_ID`) + ON DELETE CASCADE + ON UPDATE CASCADE, + ADD CONSTRAINT `fk_service_to_allotted_resources__allotted_resource_customizat1` + FOREIGN KEY (`AR_MODEL_CUSTOMIZATION_UUID`) + REFERENCES `mso_catalog`.`allotted_resource_customization` (`MODEL_CUSTOMIZATION_UUID`) + ON DELETE CASCADE + ON UPDATE CASCADE; + + +ALTER TABLE `mso_catalog`.`service_to_networks` + ADD INDEX `fk_service_to_networks__service_model_uuid_idx` (`SERVICE_MODEL_UUID` ASC), + ADD INDEX `fk_service_to_networks__network_resource_customization1_idx` (`NETWORK_MODEL_CUSTOMIZATION_UUID` ASC), + ADD CONSTRAINT `fk_service_to_networks__service__service_name_version_id` + FOREIGN KEY (`SERVICE_MODEL_UUID`) + REFERENCES `mso_catalog`.`service` (`SERVICE_NAME_VERSION_ID`) + ON DELETE CASCADE + ON UPDATE CASCADE, + ADD CONSTRAINT `fk_service_to_networks__network_resource_customization1` + FOREIGN KEY (`NETWORK_MODEL_CUSTOMIZATION_UUID`) + REFERENCES `mso_catalog`.`network_resource_customization` (`MODEL_CUSTOMIZATION_UUID`) + ON DELETE CASCADE + ON UPDATE CASCADE; + + +ALTER TABLE `mso_catalog`.`vf_module` + ADD INDEX `UK_model_customization_uuid__asdc_service_model_version` (`MODEL_CUSTOMIZATION_UUID` ASC, `ASDC_SERVICE_MODEL_VERSION` ASC); + +ALTER TABLE `mso_catalog`.`vnf_resource` + ADD UNIQUE INDEX `UK_model_customization_uuid__asdc_service_model_version` (`MODEL_CUSTOMIZATION_UUID` ASC, `ASDC_SERVICE_MODEL_VERSION` ASC); + +ALTER TABLE `mso_catalog`.`network_resource_customization` + ADD INDEX `fk_network_resource_customization__network_resource_id_idx` (`NETWORK_RESOURCE_ID` ASC), + ADD CONSTRAINT `fk_network_resource_customization__network_resource__id` + FOREIGN KEY (`NETWORK_RESOURCE_ID`) + REFERENCES `mso_catalog`.`network_resource` (`id`) + ON DELETE CASCADE + ON UPDATE CASCADE; \ No newline at end of file diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_timestamp_mso_db.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_timestamp_mso_db.sql index 12d5d8c112..bc88adcc70 100644 --- a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_timestamp_mso_db.sql +++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/sub-sql-files/catalog_timestamp_mso_db.sql @@ -12,3 +12,8 @@ ALTER TABLE HEAT_FILES MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT ALTER TABLE HEAT_TEMPLATE MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL; ALTER TABLE VF_MODULE MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL; ALTER TABLE SERVICE_RECIPE MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL; +ALTER TABLE NETWORK_RESOURCE_CUSTOMIZATION MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL; +ALTER TABLE ALLOTTED_RESOURCE_CUSTOMIZATION MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL; +ALTER TABLE SERVICE_TO_ALLOTTED_RESOURCES MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL; +ALTER TABLE SERVICE_TO_NETWORKS MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL; + -- cgit 1.2.3-korg