diff options
Diffstat (limited to 'so-simulator/src')
8 files changed, 31 insertions, 165 deletions
diff --git a/so-simulator/src/main/java/org/onap/so/simulator/actions/aai/ProcessVnfc.java b/so-simulator/src/main/java/org/onap/so/simulator/actions/aai/ProcessVnfc.java index 80e50befaa..383e1bfd5f 100644 --- a/so-simulator/src/main/java/org/onap/so/simulator/actions/aai/ProcessVnfc.java +++ b/so-simulator/src/main/java/org/onap/so/simulator/actions/aai/ProcessVnfc.java @@ -1,11 +1,9 @@ package org.onap.so.simulator.actions.aai; import java.util.Optional; +import org.onap.aai.domain.yang.VfModule; import org.onap.aai.domain.yang.Vnfc; -import org.onap.aai.domain.yang.Vserver; -import org.onap.aai.domain.yang.Vservers; import org.onap.aaiclient.client.aai.AAIResourcesClient; -import org.onap.aaiclient.client.aai.entities.uri.AAIPluralResourceUri; import org.onap.aaiclient.client.aai.entities.uri.AAIResourceUri; import org.onap.aaiclient.client.aai.entities.uri.AAIUriFactory; import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder; @@ -50,40 +48,28 @@ public class ProcessVnfc extends AbstractTestAction { vnfc.setModelVersionId("9e314c37-2258-4572-a399-c0dd7d5f1aec"); vnfc.setModelCustomizationId("2bd95cd4-d7ff-4af0-985d-2adea0339921"); + AAIResourceUri vfModuleURI = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network() + .genericVnf(context.getVariable("vnfId")).vfModule(context.getVariable("vfModuleId"))); + if (aaiResourceClient.exists(vnfcURI)) { - logger.debug("cleaning up VNFC"); - aaiResourceClient.delete(vnfcURI); + Optional<VfModule> vfModule = aaiResourceClient.get(vfModuleURI).asBean(VfModule.class); + if (vfModule.get().getVfModuleName().contains("macro")) { + String vnfcName = "ssc_server_1" + vfModule.get().getVfModuleName() + .substring(vfModule.get().getVfModuleName().length() - 1); + vnfc.setVnfcName(vnfcName); + vnfcURI = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().vnfc(vnfcName)); + } else { + logger.debug("cleaning up VNFC"); + aaiResourceClient.delete(vnfcURI); + } } logger.debug("creating new VNFC"); aaiResourceClient.create(vnfcURI, vnfc); - AAIResourceUri vfModuleURI = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network() - .genericVnf(context.getVariable("vnfId")).vfModule(context.getVariable("vfModuleId"))); logger.debug("creating VNFC edge to vf module"); aaiResourceClient.connect(vfModuleURI, vnfcURI); - } else if (context.getVariable("requestAction").equals("CreateVfModuleInstance") - && context.getVariable("serviceAction").equals("activate")) { - logger.debug("creating edge between vserver and vnfc"); - AAIResourceUri vnfcURI = - AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().vnfc("ssc_server_1")); - AAIPluralResourceUri vserverPlural = - AAIUriFactory - .createResourceUri(AAIFluentTypeBuilder.cloudInfrastructure() - .cloudRegion(context.getVariable("cloudOwner"), - context.getVariable("cloudRegion")) - .tenant(context.getVariable("tenant")).vservers()) - .queryParam("vserver-name", "ssc_server_1"); - Optional<Vserver> vserver = aaiResourceClient.getFirst(Vservers.class, Vserver.class, vserverPlural); - if (vserver.isPresent()) { - AAIResourceUri vserverURI = - AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.cloudInfrastructure() - .cloudRegion(context.getVariable("cloudOwner"), context.getVariable("cloudRegion")) - .tenant(context.getVariable("tenant")).vserver(vserver.get().getVserverId())); - aaiResourceClient.connect(vserverURI, vnfcURI); - } } - } catch (Exception e) { logger.debug("Exception in ProcessVnfc.doExecute", e); } diff --git a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/QueryResourcesByStackNameModuleReplace.java b/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/QueryResourcesByStackNameModuleReplace.java deleted file mode 100644 index f4ac519f7a..0000000000 --- a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/QueryResourcesByStackNameModuleReplace.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.onap.so.simulator.scenarios.openstack; - -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -@Scenario("Query-Replace-ID-Name-Resources") -@RequestMapping(value = "/sim/v1/tenantOne/stacks/replace_module/stackId/resources", method = RequestMethod.GET) -public class QueryResourcesByStackNameModuleReplace extends AbstractSimulatorScenario { - - @Override - public void run(ScenarioDesigner scenario) { - scenario.http().receive().get(); - - scenario.variable("stackName", "replace_module"); - - scenario.http().send().response(HttpStatus.OK).header("ContentType", "application/json") - .payload(new ClassPathResource("openstack/gr_api/zrdm52emccr01_base_resources.json")); - - } -} diff --git a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/QueryResourcesByStackNameModuleReplaceVolume.java b/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/QueryResourcesByStackNameModuleReplaceVolume.java deleted file mode 100644 index f6eebeb09e..0000000000 --- a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/QueryResourcesByStackNameModuleReplaceVolume.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.onap.so.simulator.scenarios.openstack; - -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -@Scenario("Query-Replace-Volume-ID-Name-Resources") -@RequestMapping(value = "/sim/v1/tenantOne/stacks/replace_module_volume_id/stackId/resources", - method = RequestMethod.GET) -public class QueryResourcesByStackNameModuleReplaceVolume extends AbstractSimulatorScenario { - - @Override - public void run(ScenarioDesigner scenario) { - scenario.http().receive().get(); - - scenario.variable("stackName", "replace_module_volume_id"); - - scenario.http().send().response(HttpStatus.OK).header("ContentType", "application/json") - .payload(new ClassPathResource("openstack/gr_api/zrdm52emccr01_base_resources.json")); - - } -} diff --git a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/macro/QueryResourcesByStackNameMacro1.java b/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/macro/QueryResourcesByStackNameMacro1.java deleted file mode 100644 index eb306ccd6f..0000000000 --- a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/macro/QueryResourcesByStackNameMacro1.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.onap.so.simulator.scenarios.openstack.macro; - -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -@Scenario("Openstack-Query-Stack-Resources-Macro1") -@RequestMapping(value = "/sim/v1/tenantOne/stacks/macro_module_1/stackId/resources", method = RequestMethod.GET) -public class QueryResourcesByStackNameMacro1 extends AbstractSimulatorScenario { - - - @Override - public void run(ScenarioDesigner scenario) { - scenario.http().receive().get(); - - scenario.http().send().response(HttpStatus.OK).header("ContentType", "application/json") - .payload(new ClassPathResource("openstack/gr_api/zrdm52emccr01_base_resources.json")); - - } - -} diff --git a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/macro/QueryResourcesByStackNameMacro2.java b/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/macro/QueryResourcesByStackNameMacro2.java deleted file mode 100644 index d2551a2fb3..0000000000 --- a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/macro/QueryResourcesByStackNameMacro2.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.onap.so.simulator.scenarios.openstack.macro; - -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -@Scenario("Openstack-Query-Stack-Resources-Macro2") -@RequestMapping(value = "/sim/v1/tenantOne/stacks/macro_module_2/stackId/resources", method = RequestMethod.GET) -public class QueryResourcesByStackNameMacro2 extends AbstractSimulatorScenario { - - - @Override - public void run(ScenarioDesigner scenario) { - scenario.http().receive().get(); - - scenario.http().send().response(HttpStatus.OK).header("ContentType", "application/json") - .payload(new ClassPathResource("openstack/gr_api/zrdm52emccr01_base_resources.json")); - - } - -} diff --git a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/macro/QueryResourcesByStackNameMacro3.java b/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/macro/QueryResourcesByStackNameMacro3.java deleted file mode 100644 index bb33f2c718..0000000000 --- a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/macro/QueryResourcesByStackNameMacro3.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.onap.so.simulator.scenarios.openstack.macro; - -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -@Scenario("Openstack-Query-Stack-Resources-Macro3") -@RequestMapping(value = "/sim/v1/tenantOne/stacks/macro_module_3/stackId/resources", method = RequestMethod.GET) -public class QueryResourcesByStackNameMacro3 extends AbstractSimulatorScenario { - - - @Override - public void run(ScenarioDesigner scenario) { - scenario.http().receive().get(); - - scenario.http().send().response(HttpStatus.OK).header("ContentType", "application/json") - .payload(new ClassPathResource("openstack/gr_api/zrdm52emccr01_base_resources.json")); - - } - -} diff --git a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/resources/QueryResourcesByStackName.java b/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/resources/QueryResourcesByStackName.java index 82b1af484f..22d66b0f48 100644 --- a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/resources/QueryResourcesByStackName.java +++ b/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/resources/QueryResourcesByStackName.java @@ -9,18 +9,24 @@ import com.consol.citrus.simulator.scenario.Scenario; import com.consol.citrus.simulator.scenario.ScenarioDesigner; @Scenario("Openstack-Query-Stack-Resources") -@RequestMapping(value = "/sim/v1/tenantOne/stacks/dummy_id/resources", method = RequestMethod.GET) +@RequestMapping(value = {"/sim/v1/tenantOne/stacks/dummy_id/stackId/resources", + "/sim/v1/tenantOne/stacks/base_module_id/stackId/resources", + "/sim/v1/tenantOne/stacks/replace_module/stackId/resources", + "/sim/v1/tenantOne/stacks/replace_module_volume_id/stackId/resources", + "/sim/v1/tenantOne/stacks/macro_module_1/stackId/resources", + "/sim/v1/tenantOne/stacks/macro_module_2/stackId/resources", + "/sim/v1/tenantOne/stacks/macro_module_3/stackId/resources", + "/sim/v1/tenantOne/stacks/created_success_id/stackId/resources", + "/sim/v1/tenantOne/stacks/failure__success_id/stackId/resources", + "/sim/v1/tenantOne/stacks/created_in_progress_id/stackId/resources"}, method = RequestMethod.GET) public class QueryResourcesByStackName extends AbstractSimulatorScenario { - @Override public void run(ScenarioDesigner scenario) { scenario.http().receive().get(); - scenario.variable("stackName", "dummy_id"); - - scenario.http().send().response(HttpStatus.OK) - .payload(new ClassPathResource("openstack/gr_api/GetStackResources.json")); + scenario.http().send().response(HttpStatus.OK).header("ContentType", "application/json") + .payload(new ClassPathResource("openstack/gr_api/zrdm52emccr01_base_resources.json")); } diff --git a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/resources/QueryResourcesByBaseStackName.java b/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/resources/QueryResourcesByStackName2.java index 77cc0054cc..83853fda4b 100644 --- a/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/resources/QueryResourcesByBaseStackName.java +++ b/so-simulator/src/main/java/org/onap/so/simulator/scenarios/openstack/resources/QueryResourcesByStackName2.java @@ -8,9 +8,9 @@ import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; import com.consol.citrus.simulator.scenario.Scenario; import com.consol.citrus.simulator.scenario.ScenarioDesigner; -@Scenario("Openstack-Query-Base-Stack-Resources") -@RequestMapping(value = "/sim/v1/tenantOne/stacks/base_module_id/stackId/resources", method = RequestMethod.GET) -public class QueryResourcesByBaseStackName extends AbstractSimulatorScenario { +@Scenario("Openstack-Query-Stack-Resources-2") +@RequestMapping(value = "/sim/v1/tenantOne/stacks/dummy_id/resources", method = RequestMethod.GET) +public class QueryResourcesByStackName2 extends AbstractSimulatorScenario { @Override @@ -19,8 +19,8 @@ public class QueryResourcesByBaseStackName extends AbstractSimulatorScenario { scenario.variable("stackName", "dummy_id"); - scenario.http().send().response(HttpStatus.OK).header("ContentType", "application/json") - .payload(new ClassPathResource("openstack/gr_api/zrdm52emccr01_base_resources.json")); + scenario.http().send().response(HttpStatus.OK) + .payload(new ClassPathResource("openstack/gr_api/GetStackResources.json")); } |