diff options
| -rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java | 14 | ||||
| -rw-r--r-- | vid-webpack-master/pom.xml | 25 |
2 files changed, 26 insertions, 13 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java index 2ea37f4bc..63cd62cf5 100644 --- a/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java @@ -845,20 +845,14 @@ public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests { @Test public void shouldProperlyGetDeactivateAndCloudDeletePathWithProperParameters() { - // given - String serviceInstanceId = "testServiceId"; - String vnfInstanceId = "testVnfInstanceId"; - String vfModuleInstanceId = "testVfModuleInstanceId"; - String path = validateEndpointPath(MsoProperties.MSO_REST_API_VF_MODULE_INSTANCE); - path = path.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId); - path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId); - path += "/" + vfModuleInstanceId + "/deactivateAndCloudDelete"; // when - String response = msoBusinessLogic.getDeactivateAndCloudDeletePath(serviceInstanceId, vnfInstanceId, vfModuleInstanceId); + String response = msoBusinessLogic.getDeactivateAndCloudDeletePath("testServiceId", "testVnfInstanceId", "testVfModuleInstanceId"); // then - assertThat(response).isEqualTo(path); + String expectedPath = "/serviceInstantiation/v7/serviceInstances/testServiceId/vnfs/testVnfInstanceId/"+ + "vfModules/testVfModuleInstanceId/deactivateAndCloudDelete"; + assertThat(response).isEqualTo(expectedPath); } @Test diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml index d1398cc35..8d4ab156e 100644 --- a/vid-webpack-master/pom.xml +++ b/vid-webpack-master/pom.xml @@ -29,6 +29,7 @@ <stagingNexusPath>content/repositories/staging/</stagingNexusPath> <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>content/repositories/releases/</releaseNexusPath> + <NPM_CMD>build</NPM_CMD> </properties> @@ -73,7 +74,10 @@ <profile> <id>if-not-webpack</id> <activation> - <activeByDefault>true</activeByDefault> + <property> + <name>skipModernUi</name> + <value>true</value> + </property> </activation> <build> <plugins> @@ -106,6 +110,13 @@ </profile> <profile> <id>webpack-npm</id> + <activation> + <property> + <name>skipModernUi</name> + <value>!true</value> + </property> + <activeByDefault>true</activeByDefault> + </activation> <build> <plugins> <plugin> @@ -161,7 +172,6 @@ <arguments>run ${NPM_CMD}</arguments> </configuration> </execution> - </executions> </plugin> </plugins> @@ -245,7 +255,16 @@ <webXml>src/WEB-INF/web.xml</webXml> </configuration> </plugin> - + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>dist</directory> + </fileset> + </filesets> + </configuration> + </plugin> </plugins> </build> <dependencies> |