From 2d2e0b503f915a81ae9a02dfa3afac3de369efde Mon Sep 17 00:00:00 2001 From: sheetalm Date: Thu, 8 Feb 2018 09:30:02 +0530 Subject: Onboarding foundation changes 1. Adding OnboardingSessionContextFilter which sets tenant(kespace) for onboarding application 2. Different services can extend SessionContextFilter to set their own keyspace 3. These changes in onboarding are done to support services like ActivitySpec Change-Id: Ia62557354ab05235d027250af94a2835d741b7fa Issue-ID: SDC-1005 Signed-off-by: sheetalm --- .../sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java | 3 ++- .../sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java | 3 ++- .../java/org/openecomp/sdc/versioning/impl/ItemManagerImplTest.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-versioning-lib') diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java index b2a27de2c1..bfa660a5a1 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java @@ -36,6 +36,7 @@ public class ItemZusammenDaoImplTest { private static final String ITEM_VERSIONS_STATUSES = "item_versions_statuses"; private static final String APP_PROP_1 = "app_prop1"; private static final String APP_PROP_2 = "app_prop2"; + private static final String tenant = "dox"; @Mock private ZusammenAdaptor zusammenAdaptorMock; @@ -45,7 +46,7 @@ public class ItemZusammenDaoImplTest { @BeforeMethod public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - SessionContextProviderFactory.getInstance().createInterface().create(USER); + SessionContextProviderFactory.getInstance().createInterface().create(USER, tenant); } @Test diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java index 76e1fe56b6..603e2b0297 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java @@ -37,6 +37,7 @@ import static org.openecomp.sdc.versioning.dao.impl.zusammen.TestUtil.createZusa public class VersionZusammenDaoImplTest { private static final String USER = "user1"; + private static final String tenant = "dox"; @Mock private ZusammenAdaptor zusammenAdaptorMock; @InjectMocks @@ -45,7 +46,7 @@ public class VersionZusammenDaoImplTest { @BeforeMethod public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - SessionContextProviderFactory.getInstance().createInterface().create(USER); + SessionContextProviderFactory.getInstance().createInterface().create(USER, tenant); } @Test diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/ItemManagerImplTest.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/ItemManagerImplTest.java index 6ac2ab30d5..95c38e46e4 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/ItemManagerImplTest.java +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/ItemManagerImplTest.java @@ -32,6 +32,7 @@ public class ItemManagerImplTest { private static final String ITEM_NAME = "item 1 name"; private static final String ITEM_TYPE_A = "A"; private static final String ITEM_TYPE_B = "B"; + private static final String tenant = "dox"; @Mock private ItemDao itemDao; @Mock @@ -81,7 +82,7 @@ public class ItemManagerImplTest { @Test public void testCreate() throws Exception { - SessionContextProviderFactory.getInstance().createInterface().create(USER); + SessionContextProviderFactory.getInstance().createInterface().create(USER, tenant); Item returnedItem = createItem(ITEM_ID, ITEM_NAME, ITEM_TYPE_A); doReturn(returnedItem).when(itemDao).create(any(Item.class)); -- cgit 1.2.3-korg