From f31dd5a7446ad4d692d2cdb6af4eba662e3925e3 Mon Sep 17 00:00:00 2001 From: Amichai Hemli Date: Sun, 8 Mar 2020 17:54:30 +0200 Subject: add new format to fetch requests from MSO to the CM When flag is true VID will use the format=simpleNoTaskInfo parameter in addition to the filter parameter when fetching orchestration requests for the change-management dashboard. Issue-ID: VID-787 Signed-off-by: Amichai Hemli Change-Id: I18d608db5bab6f095f399ac0f58fe5e49944a6b1 Signed-off-by: Amichai Hemli Signed-off-by: Alexey Sandler --- .../test/java/org/onap/vid/controller/MsoControllerNewTest.java | 2 +- .../src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java | 7 ++++++- .../test/java/org/onap/vid/mso/MsoOperationalEnvironmentTest.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'vid-app-common/src/test/java/org/onap') diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerNewTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerNewTest.java index 03a6c40f3..68d1706c0 100644 --- a/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerNewTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerNewTest.java @@ -36,7 +36,7 @@ public class MsoControllerNewTest { private MsoController createTestSubject() { try { - return new MsoController(new MsoBusinessLogicImpl(mock(MsoInterface.class)), mock(RestMsoImplementation.class), + return new MsoController(new MsoBusinessLogicImpl(mock(MsoInterface.class), null), mock(RestMsoImplementation.class), new CloudOwnerServiceImpl(null, null)); } catch (Exception e) { return null; 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 83fff4f5d..9d5577c7d 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 @@ -104,6 +104,7 @@ import org.springframework.test.context.testng.AbstractTestNGSpringContextTests; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import org.togglz.core.manager.FeatureManager; @ContextConfiguration(classes = {SystemProperties.class}) public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests { @@ -123,6 +124,10 @@ public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests { @Mock private RequestDetails msoRequest; + @Mock + private FeatureManager featureManager; + + private MsoBusinessLogicImpl msoBusinessLogic; private String userId = "testUserId"; @@ -131,7 +136,7 @@ public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests { @BeforeClass public void setUp() { MockitoAnnotations.initMocks(this); - msoBusinessLogic = new MsoBusinessLogicImpl(msoInterface); + msoBusinessLogic = new MsoBusinessLogicImpl(msoInterface, featureManager); } @Test diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/MsoOperationalEnvironmentTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoOperationalEnvironmentTest.java index 0ea5f2947..7b9bfac34 100644 --- a/vid-app-common/src/test/java/org/onap/vid/mso/MsoOperationalEnvironmentTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/mso/MsoOperationalEnvironmentTest.java @@ -49,7 +49,7 @@ import org.testng.annotations.Test; public class MsoOperationalEnvironmentTest { - private MsoBusinessLogic msoBusinessLogic = new MsoBusinessLogicImpl(null); + private MsoBusinessLogic msoBusinessLogic = new MsoBusinessLogicImpl(null, null); private static final Logger logger = LogManager.getLogger(MsoOperationalEnvironmentTest.class); @Test(dataProvider = "getOperationalEnvironmentActivationPermutations") -- cgit 1.2.3-korg