diff options
| author |   Michael DÜrre <michael.duerre@highstreet-technologies.com> | 2021-04-09 08:01:19 +0200 |
|---|---|---|
| committer | Michael D�rre <michael.duerre@highstreet-technologies.com> | 2021-04-13 18:37:06 +0000 |
| commit | 6ae7e8a1bae83d407b22d8b066dd0bcca730e1bb (patch) | |
| tree | f2276fee4fcc61c3d89b942c63d6211e41617cda /sdnr | |
| parent | d702f00b71218c56af766363ce19f2459081d73c (diff) | |
weekly sdnr code sync
sync internal code progress
add istanbul database structure
cleanup dataprovider test
fix pom files
Issue-ID: CCSDK-3260
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: Ic1daa6adda173dc8337a51fa930e05c05ee88e2c
Diffstat (limited to 'sdnr')
46 files changed, 1285 insertions, 548 deletions
diff --git a/sdnr/wt/README.md b/sdnr/wt/README.md index 33e708410..2b19ff66a 100644 --- a/sdnr/wt/README.md +++ b/sdnr/wt/README.md @@ -1,5 +1,7 @@ # wt - wireless transport microservices +ODL version: aluminium sr1 + ## apigateway (osgi) The API gateway provides WEB access to all wt related web service providers to prevent cross site requests. The Opendaylight default Web server is extended by additional URIs. @@ -11,6 +13,10 @@ The API gateway provides WEB access to all wt related web service providers to p Common classes, included into most bundles +## common-yang (osgi) + +yang files converted into jar bundles. Preferred way to include basic yang specs into a devicemanager project. + ## data-provider (osgi) Interface to devicemanager database. In Frankfurt database is elasticsearch. @@ -21,10 +27,7 @@ Devicemanager services, used by specfic devicemanagers for NETCONF devices. ## devicemanager-specific (osgi) -Devicemanager implementation for specfic devicemodel. Today available are: - * onf: ONF Core model - * oran: O-RAN model - * gran: 3GPP model +Devicemanager implementation for specfic devicemodel. ## featureaggregator (osgi) @@ -44,7 +47,7 @@ Provide netconf state information to devicemanager and mountpoint-state-provider Web applications for user operations for devices -## websocketmanager2 (osgi) +## websocketmanager (osgi) Notification service for browser clients. diff --git a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java index e6eb7a4e8..0de5dc246 100644 --- a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java +++ b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java @@ -67,13 +67,8 @@ public interface DataProvider extends ArchiveCleanProvider { /** * write internal equipment to database - * @param internalEquipment with mandatory fields. - */ - void writeInventory(Inventory internalEquipment); - /** - * write internal equipment to database * @param nodeId - * @param list with mandatory fields. + * @param internalEquipment with mandatory fields. */ void writeInventory(String nodeId, List<Inventory> list); diff --git a/sdnr/wt/data-provider/provider/pom.xml b/sdnr/wt/data-provider/provider/pom.xml index 3507d4108..55a770564 100644 --- a/sdnr/wt/data-provider/provider/pom.xml +++ b/sdnr/wt/data-provider/provider/pom.xml @@ -48,8 +48,8 @@ <properties> <maven.javadoc.skip>true</maven.javadoc.skip> - <databaseport>49402</databaseport> - <initdb>${basedir}/../setup/target/sdnr-dmt.jar</initdb> + <databaseport>49402</databaseport> + <initdb>${basedir}/../setup/target/sdnr-wt-data-provider-setup-${project.version}.jar</initdb> </properties> <dependencies> diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/entity/HtDatabaseEventsService.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/entity/HtDatabaseEventsService.java index f680edddf..948bd7317 100644 --- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/entity/HtDatabaseEventsService.java +++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/entity/HtDatabaseEventsService.java @@ -265,8 +265,7 @@ public class HtDatabaseEventsService implements ArchiveCleanProvider, DataProvid * @param internalEquipment with mandatory fields. */ - @Override - public void writeInventory(Inventory internalEquipment) { + private void writeInventory(Inventory internalEquipment) { if (internalEquipment.getManufacturerIdentifier() == null) { internalEquipment = new InventoryBuilder(internalEquipment).setManufacturerIdentifier("").build(); diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestEventService.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestEventService.java index 56138b0b1..b83034d90 100644 --- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestEventService.java +++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestEventService.java @@ -206,7 +206,6 @@ public class TestEventService { List<NetworkElementConnectionEntity> nes = service.getNetworkElementConnections(); assertEquals(0, nes.size()); service.updateNetworkConnection22(createNeConnection(NODEID, NetworkElementDeviceType.Unknown), NODEID); - service.updateNetworkConnection22(createNeConnection(NODEID, NetworkElementDeviceType.Unknown), NODEID); service.updateNetworkConnection22(createNeConnection(NODEID2, NetworkElementDeviceType.ORAN), NODEID2); nes = service.getNetworkElementConnections(); assertEquals(2, nes.size()); @@ -279,7 +278,6 @@ public class TestEventService { /** * @param devType - * @param mountMethod * @param nodename3 * @return */ diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestInventoryConsistency.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestInventoryConsistency.java new file mode 100644 index 000000000..ed8eac949 --- /dev/null +++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestInventoryConsistency.java @@ -0,0 +1,70 @@ +/* + * ============LICENSE_START======================================================= + * ONAP : ccsdk features + * ================================================================================ + * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. + * All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + * + */ +package org.onap.ccsdk.features.sdnr.wt.dataprovider.test; + +import static org.junit.Assert.fail; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient; +import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit; +import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.ElasticSearchDataProvider; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.test.util.HostInfoForTest; +import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapper; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Inventory; + +public class TestInventoryConsistency { + + private static final String TEST1NODEID = "sim1"; + private static String resourceDirectoryPath = "/" + TestTree.class.getSimpleName() + "/"; + private static ElasticSearchDataProvider dbProvider; + private static HtDatabaseClient dbRawProvider; + + @BeforeClass + public static void init() throws Exception { + HostInfo[] hosts = HostInfoForTest.get(); + dbProvider = new ElasticSearchDataProvider(hosts); + dbProvider.waitForYellowDatabaseStatus(30, TimeUnit.SECONDS); + dbRawProvider = HtDatabaseClient.getClient(hosts); + } + + @Test + public void test1() { + YangToolsMapper mapper = new YangToolsMapper(); + try { + SearchHit[] hits = TestTree.loadEntries("test1.json"); + List<Inventory> inventoryList = new ArrayList<>(); + for(SearchHit hit:hits) { + inventoryList.add(mapper.readValue(hit.getSourceAsString(), Inventory.class)); + } + dbProvider.getDataProvider().writeInventory(TEST1NODEID, inventoryList); + } catch (IOException e) { + + e.printStackTrace(); + fail(e.getMessage()); + } + } +} diff --git a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTree.java b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTree.java index e32179122..28f7d49fe 100644 --- a/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTree.java +++ b/sdnr/wt/data-provider/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/test/TestTree.java @@ -25,10 +25,12 @@ import java.io.IOException; import java.util.Arrays; import java.util.concurrent.TimeUnit; import org.apache.sshd.common.util.io.IoUtils; +import org.json.JSONArray; import org.json.JSONObject; import org.junit.BeforeClass; import org.junit.Test; import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient; +import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit; import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo; import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders; import org.onap.ccsdk.features.sdnr.wt.common.database.requests.DeleteByQueryRequest; @@ -43,7 +45,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.pro public class TestTree { - private static String resourceDirectoryPath="/"+TestTree.class.getSimpleName()+"/"; + private static String resourceDirectoryPath = "/" + TestTree.class.getSimpleName() + "/"; private static ElasticSearchDataProvider dbProvider; private static HtDatabaseClient dbRawProvider; @@ -53,39 +55,44 @@ public class TestTree { dbProvider = new ElasticSearchDataProvider(hosts); dbProvider.waitForYellowDatabaseStatus(30, TimeUnit.SECONDS); dbRawProvider = HtDatabaseClient.getClient(hosts); + + + } + + public static void clearTestData(HtDatabaseClient dbRawProvider) throws IOException { DeleteByQueryRequest query = new DeleteByQueryRequest(Entity.Inventoryequipment.getName(), true); query.setQuery(QueryBuilders.matchAllQuery().toJSON()); dbRawProvider.deleteByQuery(query); - fillTestData(); } - private static void fillTestData() throws IOException { - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.5.5", getFileContent("1.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.7.0", getFileContent("2.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.55.1.2", getFileContent("3.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.65.1.2", getFileContent("4.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/SHELF-1.1.0.0", getFileContent("5.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.1.5", getFileContent("6.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.1.8", getFileContent("7.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.6.5", getFileContent("8.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/ODU-1.56.0.0", getFileContent("9.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.56.1.2", getFileContent("10.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/IDU-1.65.0.0", getFileContent("11.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.65.1.4", getFileContent("12.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.6.0", getFileContent("13.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.8.0", getFileContent("14.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.9.0", getFileContent("15.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.55.1.4", getFileContent("16.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.1.7", getFileContent("17.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/IDU-1.55.0.0", getFileContent("18.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.1.0", getFileContent("19.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/CARD-1.1.5.0", getFileContent("20.json")); - dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), "sim1/a2.module-1.1.5.6", getFileContent("21.json")); + public static void fillTestData(HtDatabaseClient dbRawProvider, String filename) throws IOException { + SearchHit[] entries = loadEntries(filename); + for (SearchHit entry : entries) { + dbRawProvider.doWriteRaw(Entity.Inventoryequipment.getName(), entry.getId(), entry.getSourceAsString()); + } } + public static SearchHit[] loadEntries(String filename) throws IOException { + String content = getFileContent(filename); + JSONArray a = new JSONArray(content); + SearchHit[] results = new SearchHit[a.length()]; + for (int i = 0; i < a.length(); i++) { + results[i] = new SearchHit(a.getJSONObject(i)); + } + return results; + } + @Test public void testInventoryTree() throws IOException { + test1(); + //test2(); + + } + + private void test1() throws IOException { + clearTestData(dbRawProvider); + fillTestData(dbRawProvider, "test1.json"); DataTreeProviderImpl provider = new DataTreeProviderImpl(); provider.setDatabaseClient(dbRawProvider); @@ -93,40 +100,66 @@ public class TestTree { DataTreeObject tree = provider.readInventoryTree(null, null); System.out.println(tree.toJSON()); JSONObject o = new JSONObject(tree.toJSON()); - JSONAssert.assertContainsOnlyKey(o, "sim1"); + JSONAssert.assertContainsExactKeys(o, new String[]{"sim1","sim2"}); JSONObject children = o.getJSONObject("sim1").getJSONObject("children"); this.assertSim1(children); tree = provider.readInventoryTree(Arrays.asList("sim1"), "*"); this.assertSim1(new JSONObject(tree.toJSON())); System.out.println(tree.toJSON()); + } + + private void test2() throws IOException { + clearTestData(dbRawProvider); + fillTestData(dbRawProvider, "test2.json"); + DataTreeProviderImpl provider = new DataTreeProviderImpl(); + provider.setDatabaseClient(dbRawProvider); + + DataTreeObject tree = + provider.readInventoryTree(Arrays.asList("netconf_server_simulator"), "*"); + System.out.println(tree.toJSON()); + JSONObject o = new JSONObject(tree.toJSON()); + JSONAssert.assertContainsOnlyKey(o, "sim1"); + JSONObject children = o.getJSONObject("sim1").getJSONObject("children"); + this.assertSim1(children); + + tree = provider.readInventoryTree(Arrays.asList("sim1"), "*"); + this.assertSim1(new JSONObject(tree.toJSON())); + System.out.println(tree.toJSON()); } private void assertSim1(JSONObject sim1Children) { - JSONAssert.assertContainsExactKeys(sim1Children,new String[] {"sim1/ODU-1.56.0.0", "sim1/IDU-1.55.0.0", "sim1/IDU-1.65.0.0", "sim1/SHELF-1.1.0.0"}); + JSONAssert.assertContainsExactKeys(sim1Children, + new String[] {"sim1/ODU-1.56.0.0", "sim1/IDU-1.55.0.0", "sim1/IDU-1.65.0.0", "sim1/SHELF-1.1.0.0"}); JSONObject c1 = sim1Children.getJSONObject("sim1/ODU-1.56.0.0"); JSONObject c2 = sim1Children.getJSONObject("sim1/IDU-1.55.0.0"); JSONObject c3 = sim1Children.getJSONObject("sim1/IDU-1.65.0.0"); JSONObject c4 = sim1Children.getJSONObject("sim1/SHELF-1.1.0.0"); - JSONAssert.assertContainsExactKeys(c1.getJSONObject("children"),new String[] {"sim1/a2.module-1.56.1.2"}); - JSONAssert.assertContainsExactKeys(c2.getJSONObject("children"),new String[] {"sim1/a2.module-1.55.1.2","sim1/CARD-1.55.1.4"}); - JSONAssert.assertContainsExactKeys(c3.getJSONObject("children"),new String[] {"sim1/a2.module-1.65.1.2","sim1/CARD-1.65.1.4"}); - JSONAssert.assertContainsExactKeys(c4.getJSONObject("children"),new String[] {"sim1/CARD-1.1.1.0", - "sim1/CARD-1.1.5.0", "sim1/CARD-1.1.7.0","sim1/CARD-1.1.6.0", "sim1/CARD-1.1.9.0","sim1/CARD-1.1.8.0"}); + JSONAssert.assertContainsExactKeys(c1.getJSONObject("children"), new String[] {"sim1/a2.module-1.56.1.2"}); + JSONAssert.assertContainsExactKeys(c2.getJSONObject("children"), + new String[] {"sim1/a2.module-1.55.1.2", "sim1/CARD-1.55.1.4"}); + JSONAssert.assertContainsExactKeys(c3.getJSONObject("children"), + new String[] {"sim1/a2.module-1.65.1.2", "sim1/CARD-1.65.1.4"}); + JSONAssert.assertContainsExactKeys(c4.getJSONObject("children"), + new String[] {"sim1/CARD-1.1.1.0", "sim1/CARD-1.1.5.0", "sim1/CARD-1.1.7.0", "sim1/CARD-1.1.6.0", + "sim1/CARD-1.1.9.0", "sim1/CARD-1.1.8.0"}); JSONObject c41 = c4.getJSONObject("children").getJSONObject("sim1/CARD-1.1.1.0"); JSONObject c42 = c4.getJSONObject("children").getJSONObject("sim1/CARD-1.1.5.0"); JSONObject c43 = c4.getJSONObject("children").getJSONObject("sim1/CARD-1.1.7.0"); JSONObject c44 = c4.getJSONObject("children").getJSONObject("sim1/CARD-1.1.6.0"); JSONObject c45 = c4.getJSONObject("children").getJSONObject("sim1/CARD-1.1.9.0"); JSONObject c46 = c4.getJSONObject("children").getJSONObject("sim1/CARD-1.1.8.0"); - JSONAssert.assertContainsExactKeys(c41.getJSONObject("children"),new String[] {"sim1/a2.module-1.1.1.7","sim1/a2.module-1.1.1.5","sim1/a2.module-1.1.1.8"}); - JSONAssert.assertContainsExactKeys(c42.getJSONObject("children"),new String[] {"sim1/a2.module-1.1.5.6","sim1/a2.module-1.1.5.5"}); + JSONAssert.assertContainsExactKeys(c41.getJSONObject("children"), + new String[] {"sim1/a2.module-1.1.1.7", "sim1/a2.module-1.1.1.5", "sim1/a2.module-1.1.1.8"}); + JSONAssert.assertContainsExactKeys(c42.getJSONObject("children"), + new String[] {"sim1/a2.module-1.1.5.6", "sim1/a2.module-1.1.5.5"}); JSONAssert.assertContainsNoKeys(c43.getJSONObject("children")); - JSONAssert.assertContainsExactKeys(c44.getJSONObject("children"),new String[] {"sim1/a2.module-1.1.6.5"}); + JSONAssert.assertContainsExactKeys(c44.getJSONObject("children"), new String[] {"sim1/a2.module-1.1.6.5"}); JSONAssert.assertContainsNoKeys(c45.getJSONObject("children")); JSONAssert.assertContainsNoKeys(c46.getJSONObject("children")); } + @Test public void testUriConversion() { EntityWithTree e = DataTreeHttpServlet.getEntity("/tree/read-inventoryequipment-tree/sim1/sim1%2FODU"); @@ -135,7 +168,14 @@ public class TestTree { System.out.println(e); } + @Test + public void testUriConversion1() { + EntityWithTree e = DataTreeHttpServlet.getEntity("/tree/read-inventoryequipment-tree/sim1"); + System.out.println(e); + } + private static String getFileContent(String filename) throws IOException { - return String.join("\n",IoUtils.readAllLines(TestTree.class.getResourceAsStream(resourceDirectoryPath+filename))); + return String.join("\n", + IoUtils.readAllLines(TestTree.class.getResourceAsStream(resourceDirectoryPath + filename))); } } diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/1.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/1.json deleted file mode 100644 index bcf5e1d0a..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/1.json +++ /dev/null @@ -1,17 +0,0 @@ - { - "description": "WS/p8.module/a2.module#5", - "date": "2013-04-13T00:00:00.0Z", - "version": "a2.module-newest", - "node-id": "sim1", - "uuid": "a2.module-1.1.5.5", - "parent-uuid": "CARD-1.1.5.0", - "contained-holder": [ - "SUBRACK-1.55.0.0" - ], - "tree-level": 2, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "310330015", - "part-type-id": "3EM23141AD01", - "model-identifier": "CRPQABVFAA", - "type-name": "a2.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/10.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/10.json deleted file mode 100644 index 6eed5d6a8..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/10.json +++ /dev/null @@ -1,15 +0,0 @@ - { - "description": "MWR#56Ch#1/a2.moduletraff", - "date": "2017-09-09T00:00:00.0Z", - "version": "a2.module-newest", - "node-id": "sim1", - "uuid": "a2.module-1.56.1.2", - "parent-uuid": "ODU-1.56.0.0", - "contained-holder": [], - "tree-level": 1, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "Serial1", - "part-type-id": "Partnumber", - "model-identifier": "model-id", - "type-name": "a2.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/11.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/11.json deleted file mode 100644 index 46a4d0650..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/11.json +++ /dev/null @@ -1,18 +0,0 @@ - { - "description": "MWR-ng Dir#6.5-Ch#1", - "date": "2014-01-16T00:00:00.0Z", - "version": "MWR-ng", - "node-id": "sim1", - "uuid": "IDU-1.65.0.0", - "parent-uuid": "network-element", - "contained-holder": [ - "PORT-1.65.1.4", - "PORT-1.65.1.2" - ], - "tree-level": 0, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "WAUZZI", - "part-type-id": "3DB76047BAAA02", - "model-identifier": "model-id-s3s", - "type-name": "MWR-ng" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/12.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/12.json deleted file mode 100644 index 02d592e56..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/12.json +++ /dev/null @@ -1,15 +0,0 @@ - { - "description": "MWR#55Ch#0/RxDiv", - "date": "2014-01-08T00:00:00.0Z", - "version": "2017", - "node-id": "sim1", - "uuid": "CARD-1.65.1.4", - "parent-uuid": "IDU-1.65.0.0", - "contained-holder": [], - "tree-level": 1, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "Serie2017-13", - "part-type-id": "partNo2017-12", - "model-identifier": "model-id-s3s", - "type-name": "RxDiv" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/13.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/13.json deleted file mode 100644 index 85c3723b7..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/13.json +++ /dev/null @@ -1,20 +0,0 @@ - { - "description": "WS/p8.module", - "date": "2013-11-23T00:00:00.0Z", - "version": "234", - "node-id": "sim1", - "uuid": "CARD-1.1.6.0", - "parent-uuid": "SHELF-1.1.0.0", - "contained-holder": [ - "PORT-1.1.6.5", - "PORT-1.1.6.7", - "PORT-1.1.6.6", - "PORT-1.1.6.8" - ], - "tree-level": 1, - "manufacturer-identifier": "SAN", - "serial": "serial-number-124", - "part-type-id": "part-number-12", - "model-identifier": "model-id-12", - "type-name": "p8.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/14.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/14.json deleted file mode 100644 index 1fa236e10..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/14.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "description": "WS/DS3", - "date": "2008-10-21T00:00:00.0Z", - "version": "unknown", - "node-id": "sim1", - "uuid": "CARD-1.1.8.0", - "parent-uuid": "SHELF-1.1.0.0", - "contained-holder": [], - "tree-level": 1, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "sd-dsa-eqw", - "part-type-id": "unknown", - "model-identifier": "model-id-s3s", - "type-name": "p4.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/15.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/15.json deleted file mode 100644 index ff40c4e8b..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/15.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "description": "WS/wind", - "date": "2007-02-19T00:00:00.0Z", - "version": "wind", - "node-id": "sim1", - "uuid": "CARD-1.1.9.0", - "parent-uuid": "SHELF-1.1.0.0", - "contained-holder": [], - "tree-level": 1, - "manufacturer-identifier": "CIT", - "serial": "proto-type", - "part-type-id": "party-yea", - "model-identifier": "model-id-s3s", - "type-name": "wind" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/16.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/16.json deleted file mode 100644 index fbd62e04d..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/16.json +++ /dev/null @@ -1,15 +0,0 @@ - { - "description": "MWR#55Ch#1/RxDiv", - "date": "2014-01-07T00:00:00.0Z", - "version": "2017", - "node-id": "sim1", - "uuid": "CARD-1.55.1.4", - "parent-uuid": "IDU-1.55.0.0", - "contained-holder": [], - "tree-level": 1, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "Serie2017-12", - "part-type-id": "partNo2017-12", - "model-identifier": "model-id-s3s", - "type-name": "RxDiv" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/17.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/17.json deleted file mode 100644 index 1704468f3..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/17.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "description": "WS/CORE-MAIN/a2.module#7", - "date": "2009-01-19T00:00:00.0Z", - "version": "a2.module-newest", - "node-id": "sim1", - "uuid": "a2.module-1.1.1.7", - "parent-uuid": "CARD-1.1.1.0", - "contained-holder": [ - "SUBRACK-1.17.0.0" - ], - "tree-level": 2, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "91T403003322", - "part-type-id": "1AB187280031", - "model-identifier": "mod2", - "type-name": "a2.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/18.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/18.json deleted file mode 100644 index eaec335b4..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/18.json +++ /dev/null @@ -1,18 +0,0 @@ - { - "description": "MWR-ng Dir#5.5-Ch#1", - "date": "2014-01-15T00:00:00.0Z", - "version": "MWR-ng", - "node-id": "sim1", - "uuid": "IDU-1.55.0.0", - "parent-uuid": "network-element", - "contained-holder": [ - "PORT-1.55.1.2", - "PORT-1.55.1.4" - ], - "tree-level": 0, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "Serie2017-14", - "part-type-id": "3DB76047BAAA02", - "model-identifier": "model-id-s3s", - "type-name": "MWR-ng" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/19.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/19.json deleted file mode 100644 index 9a7eb62a7..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/19.json +++ /dev/null @@ -1,20 +0,0 @@ - { - "description": "WS/CORE-MAIN", - "date": "2015-08-17T00:00:00.0Z", - "version": "123", - "node-id": "sim1", - "uuid": "CARD-1.1.1.0", - "parent-uuid": "SHELF-1.1.0.0", - "contained-holder": [ - "PORT-1.1.1.6", - "PORT-1.1.1.5", - "PORT-1.1.1.8", - "PORT-1.1.1.7" - ], - "tree-level": 1, - "manufacturer-identifier": "SAN", - "serial": "asdf-asdasd-asd", - "part-type-id": "part-number-2", - "model-identifier": "model-id-2", - "type-name": "latest" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/2.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/2.json deleted file mode 100644 index ff352653a..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/2.json +++ /dev/null @@ -1,15 +0,0 @@ - { - "description": "WS/DS1", - "date": "2007-08-27T00:00:00.0Z", - "version": "p1.module", - "node-id": "sim1", - "uuid": "CARD-1.1.7.0", - "parent-uuid": "SHELF-1.1.0.0", - "contained-holder": [], - "tree-level": 1, - "manufacturer-identifier": "CIT", - "serial": "serial-number-s3s", - "part-type-id": "part-number-s3s", - "model-identifier": "model-id-s3s", - "type-name": "p1.module_A" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/20.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/20.json deleted file mode 100644 index 179794027..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/20.json +++ /dev/null @@ -1,20 +0,0 @@ - { - "description": "WS/p8.module", - "date": "2013-10-21T00:00:00.0Z", - "version": "234", - "node-id": "sim1", - "uuid": "CARD-1.1.5.0", - "parent-uuid": "SHELF-1.1.0.0", - "contained-holder": [ - "PORT-1.1.5.6", - "PORT-1.1.5.5", - "PORT-1.1.5.8", - "PORT-1.1.5.7" - ], - "tree-level": 1, - "manufacturer-identifier": "SAN", - "serial": "africa", - "part-type-id": "part-number-12", - "model-identifier": "model-id-12", - "type-name": "p8.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/21.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/21.json deleted file mode 100644 index c76d6715e..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/21.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "description": "WS/p8.module/a2.module#6", - "date": "", - "version": "", - "node-id": "sim1", - "uuid": "a2.module-1.1.5.6", - "parent-uuid": "CARD-1.1.5.0", - "contained-holder": [ - "SUBRACK-1.56.0.0" - ], - "tree-level": 2, - "manufacturer-identifier": "", - "serial": "", - "part-type-id": "", - "model-identifier": "", - "type-name": "a2.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/3.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/3.json deleted file mode 100644 index 1dc6dfce2..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/3.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "description": "MWR#55Ch#1/a2.moduletraff", - "date": "2013-04-13T00:00:00.0Z", - "version": "a2.module-newest", - "node-id": "sim1", - "uuid": "a2.module-1.55.1.2", - "parent-uuid": "IDU-1.55.0.0", - "contained-holder": [], - "tree-level": 1, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "310330015", - "part-type-id": "3EM23141AD01", - "model-identifier": "CRPQABVFAA", - "type-name": "a2.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/4.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/4.json deleted file mode 100644 index ab1132692..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/4.json +++ /dev/null @@ -1,15 +0,0 @@ - { - "description": "MWR#65Ch#1/a2.moduletraff", - "date": "2013-04-13T00:00:00.0Z", - "version": "a2.module-newest", - "node-id": "sim1", - "uuid": "a2.module-1.65.1.2", - "parent-uuid": "IDU-1.65.0.0", - "contained-holder": [], - "tree-level": 1, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "310330008", - "part-type-id": "3EM23141AD01", - "model-identifier": "CRPQABVFAA", - "type-name": "a2.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/5.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/5.json deleted file mode 100644 index e54173fe6..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/5.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "description": "WS-8", - "date": "2017-09-09T00:00:00.0Z", - "version": "a2.module-newest", - "node-id": "sim1", - "uuid": "SHELF-1.1.0.0", - "parent-uuid": "network-element", - "contained-holder": [ - "SLOT-1.1.1.0", - "SLOT-1.1.2.0", - "SLOT-1.1.3.0", - "SLOT-1.1.4.0", - "SLOT-1.1.5.0", - "SLOT-1.1.6.0", - "SLOT-1.1.7.0", - "SLOT-1.1.8.0", - "SLOT-1.1.9.0" - ], - "tree-level": 0, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "Serial1", - "part-type-id": "Partnumber", - "model-identifier": "model-id", - "type-name": "WS-8" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/6.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/6.json deleted file mode 100644 index 8486033b0..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/6.json +++ /dev/null @@ -1,17 +0,0 @@ - { - "description": "WS/CORE-MAIN/a2.module#5", - "date": "2005-11-09T00:00:00.0Z", - "version": "a2.module-newest", - "node-id": "sim1", - "uuid": "a2.module-1.1.1.5", - "parent-uuid": "CARD-1.1.1.0", - "contained-holder": [ - "SUBRACK-1.15.0.0" - ], - "tree-level": 2, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "0003548168", - "part-type-id": "3FE25774AA01", - "model-identifier": "VAUIAEYAAA", - "type-name": "a2.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/7.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/7.json deleted file mode 100644 index 5c583bec7..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/7.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "description": "WS/CORE-MAIN/a2.module#8", - "date": "2010-02-05T00:00:00.0Z", - "version": "a2.module-newest", - "node-id": "sim1", - "uuid": "a2.module-1.1.1.8", - "parent-uuid": "CARD-1.1.1.0", - "contained-holder": [ - "SUBRACK-1.18.0.0" - ], - "tree-level": 2, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "01T441601301", - "part-type-id": "1AB376720002", - "model-identifier": "NGI7AMLMAA", - "type-name": "a2.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/8.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/8.json deleted file mode 100644 index a86819a7d..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/8.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "description": "WS/p8.module/a2.module#5", - "date": "2013-04-13T00:00:00.0Z", - "version": "a2.module-newest", - "node-id": "sim1", - "uuid": "a2.module-1.1.6.5", - "parent-uuid": "CARD-1.1.6.0", - "contained-holder": [ - "SUBRACK-1.65.0.0" - ], - "tree-level": 2, - "manufacturer-identifier": "ONF-Wireless-Transport", - "serial": "310330008", - "part-type-id": "3EM23141AD01", - "model-identifier": "CRPQABVFAA", - "type-name": "a2.module" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/9.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/9.json deleted file mode 100644 index 914033bb4..000000000 --- a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/9.json +++ /dev/null @@ -1,19 +0,0 @@ - { - "description": "MWR-hyper Dir#5.6-Ch#1", - "date": "", - "version": "extrem-hyper", - "node-id": "sim1", - "uuid": "ODU-1.56.0.0", - "parent-uuid": "network-element", - "contained-holder": [ - "PORT-1.56.1.2", - "PORT-1.56.1.3", - "PORT-1.56.1.4" - ], - "tree-level": 0, - "manufacturer-identifier": "", - "serial": "", - "part-type-id": "", - "model-identifier": "", - "type-name": "MWR-hyper" -}
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/test1.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/test1.json new file mode 100644 index 000000000..941405ef3 --- /dev/null +++ b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/test1.json @@ -0,0 +1,513 @@ +[ + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/a2.module-1.1.5.5", + "_score": 1, + "_source": { + "description": "WS/p8.module/a2.module#5", + "date": "2013-04-13T00:00:00.0Z", + "version": "a2.module-newest", + "node-id": "sim1", + "uuid": "a2.module-1.1.5.5", + "parent-uuid": "CARD-1.1.5.0", + "contained-holder": [ + "SUBRACK-1.55.0.0" + ], + "tree-level": 2, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "310330015", + "part-type-id": "3EM23141AD01", + "model-identifier": "CRPQABVFAA", + "type-name": "a2.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/CARD-1.1.7.0", + "_score": 1, + "_source": { + "description": "WS/DS1", + "date": "2007-08-27T00:00:00.0Z", + "version": "p1.module", + "node-id": "sim1", + "uuid": "CARD-1.1.7.0", + "parent-uuid": "SHELF-1.1.0.0", + "contained-holder": [], + "tree-level": 1, + "manufacturer-identifier": "CIT", + "serial": "serial-number-s3s", + "part-type-id": "part-number-s3s", + "model-identifier": "model-id-s3s", + "type-name": "p1.module_A" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/a2.module-1.55.1.2", + "_score": 1, + "_source": { + "description": "MWR#55Ch#1/a2.moduletraff", + "date": "2013-04-13T00:00:00.0Z", + "version": "a2.module-newest", + "node-id": "sim1", + "uuid": "a2.module-1.55.1.2", + "parent-uuid": "IDU-1.55.0.0", + "contained-holder": [], + "tree-level": 1, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "310330015", + "part-type-id": "3EM23141AD01", + "model-identifier": "CRPQABVFAA", + "type-name": "a2.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/a2.module-1.65.1.2", + "_score": 1, + "_source": { + "description": "MWR#65Ch#1/a2.moduletraff", + "date": "2013-04-13T00:00:00.0Z", + "version": "a2.module-newest", + "node-id": "sim1", + "uuid": "a2.module-1.65.1.2", + "parent-uuid": "IDU-1.65.0.0", + "contained-holder": [], + "tree-level": 1, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "310330008", + "part-type-id": "3EM23141AD01", + "model-identifier": "CRPQABVFAA", + "type-name": "a2.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/SHELF-1.1.0.0", + "_score": 1, + "_source": { + "description": "WS-8", + "date": "2017-09-09T00:00:00.0Z", + "version": "a2.module-newest", + "node-id": "sim1", + "uuid": "SHELF-1.1.0.0", + "parent-uuid": "network-element", + "contained-holder": [ + "SLOT-1.1.1.0", + "SLOT-1.1.2.0", + "SLOT-1.1.3.0", + "SLOT-1.1.4.0", + "SLOT-1.1.5.0", + "SLOT-1.1.6.0", + "SLOT-1.1.7.0", + "SLOT-1.1.8.0", + "SLOT-1.1.9.0" + ], + "tree-level": 0, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serial1", + "part-type-id": "Partnumber", + "model-identifier": "model-id", + "type-name": "WS-8" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/a2.module-1.1.1.5", + "_score": 1, + "_source": { + "description": "WS/CORE-MAIN/a2.module#5", + "date": "2005-11-09T00:00:00.0Z", + "version": "a2.module-newest", + "node-id": "sim1", + "uuid": "a2.module-1.1.1.5", + "parent-uuid": "CARD-1.1.1.0", + "contained-holder": [ + "SUBRACK-1.15.0.0" + ], + "tree-level": 2, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "0003548168", + "part-type-id": "3FE25774AA01", + "model-identifier": "VAUIAEYAAA", + "type-name": "a2.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/a2.module-1.1.1.8", + "_score": 1, + "_source": { + "description": "WS/CORE-MAIN/a2.module#8", + "date": "2010-02-05T00:00:00.0Z", + "version": "a2.module-newest", + "node-id": "sim1", + "uuid": "a2.module-1.1.1.8", + "parent-uuid": "CARD-1.1.1.0", + "contained-holder": [ + "SUBRACK-1.18.0.0" + ], + "tree-level": 2, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "01T441601301", + "part-type-id": "1AB376720002", + "model-identifier": "NGI7AMLMAA", + "type-name": "a2.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/a2.module-1.1.6.5", + "_score": 1, + "_source": { + "description": "WS/p8.module/a2.module#5", + "date": "2013-04-13T00:00:00.0Z", + "version": "a2.module-newest", + "node-id": "sim1", + "uuid": "a2.module-1.1.6.5", + "parent-uuid": "CARD-1.1.6.0", + "contained-holder": [ + "SUBRACK-1.65.0.0" + ], + "tree-level": 2, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "310330008", + "part-type-id": "3EM23141AD01", + "model-identifier": "CRPQABVFAA", + "type-name": "a2.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/ODU-1.56.0.0", + "_score": 1, + "_source": { + "description": "MWR-hyper Dir#5.6-Ch#1", + "date": "", + "version": "extrem-hyper", + "node-id": "sim1", + "uuid": "ODU-1.56.0.0", + "parent-uuid": "network-element", + "contained-holder": [ + "PORT-1.56.1.2", + "PORT-1.56.1.3", + "PORT-1.56.1.4" + ], + "tree-level": 0, + "manufacturer-identifier": "", + "serial": "", + "part-type-id": "", + "model-identifier": "", + "type-name": "MWR-hyper" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/a2.module-1.56.1.2", + "_score": 1, + "_source": { + "description": "MWR#56Ch#1/a2.moduletraff", + "date": "2017-09-09T00:00:00.0Z", + "version": "a2.module-newest", + "node-id": "sim1", + "uuid": "a2.module-1.56.1.2", + "parent-uuid": "ODU-1.56.0.0", + "contained-holder": [], + "tree-level": 1, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serial1", + "part-type-id": "Partnumber", + "model-identifier": "model-id", + "type-name": "a2.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/IDU-1.65.0.0", + "_score": 1, + "_source": { + "description": "MWR-ng Dir#6.5-Ch#1", + "date": "2014-01-16T00:00:00.0Z", + "version": "MWR-ng", + "node-id": "sim1", + "uuid": "IDU-1.65.0.0", + "parent-uuid": "network-element", + "contained-holder": [ + "PORT-1.65.1.4", + "PORT-1.65.1.2" + ], + "tree-level": 0, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "WAUZZI", + "part-type-id": "3DB76047BAAA02", + "model-identifier": "model-id-s3s", + "type-name": "MWR-ng" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/CARD-1.65.1.4", + "_score": 1, + "_source": { + "description": "MWR#55Ch#0/RxDiv", + "date": "2014-01-08T00:00:00.0Z", + "version": "2017", + "node-id": "sim1", + "uuid": "CARD-1.65.1.4", + "parent-uuid": "IDU-1.65.0.0", + "contained-holder": [], + "tree-level": 1, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serie2017-13", + "part-type-id": "partNo2017-12", + "model-identifier": "model-id-s3s", + "type-name": "RxDiv" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/CARD-1.1.6.0", + "_score": 1, + "_source": { + "description": "WS/p8.module", + "date": "2013-11-23T00:00:00.0Z", + "version": "234", + "node-id": "sim1", + "uuid": "CARD-1.1.6.0", + "parent-uuid": "SHELF-1.1.0.0", + "contained-holder": [ + "PORT-1.1.6.5", + "PORT-1.1.6.7", + "PORT-1.1.6.6", + "PORT-1.1.6.8" + ], + "tree-level": 1, + "manufacturer-identifier": "SAN", + "serial": "serial-number-124", + "part-type-id": "part-number-12", + "model-identifier": "model-id-12", + "type-name": "p8.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/CARD-1.1.8.0", + "_score": 1, + "_source": { + "description": "WS/DS3", + "date": "2008-10-21T00:00:00.0Z", + "version": "unknown", + "node-id": "sim1", + "uuid": "CARD-1.1.8.0", + "parent-uuid": "SHELF-1.1.0.0", + "contained-holder": [], + "tree-level": 1, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "sd-dsa-eqw", + "part-type-id": "unknown", + "model-identifier": "model-id-s3s", + "type-name": "p4.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/CARD-1.1.9.0", + "_score": 1, + "_source": { + "description": "WS/wind", + "date": "2007-02-19T00:00:00.0Z", + "version": "wind", + "node-id": "sim1", + "uuid": "CARD-1.1.9.0", + "parent-uuid": "SHELF-1.1.0.0", + "contained-holder": [], + "tree-level": 1, + "manufacturer-identifier": "CIT", + "serial": "proto-type", + "part-type-id": "party-yea", + "model-identifier": "model-id-s3s", + "type-name": "wind" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/CARD-1.55.1.4", + "_score": 1, + "_source": { + "description": "MWR#55Ch#1/RxDiv", + "date": "2014-01-07T00:00:00.0Z", + "version": "2017", + "node-id": "sim1", + "uuid": "CARD-1.55.1.4", + "parent-uuid": "IDU-1.55.0.0", + "contained-holder": [], + "tree-level": 1, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serie2017-12", + "part-type-id": "partNo2017-12", + "model-identifier": "model-id-s3s", + "type-name": "RxDiv" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/a2.module-1.1.1.7", + "_score": 1, + "_source": { + "description": "WS/CORE-MAIN/a2.module#7", + "date": "2009-01-19T00:00:00.0Z", + "version": "a2.module-newest", + "node-id": "sim1", + "uuid": "a2.module-1.1.1.7", + "parent-uuid": "CARD-1.1.1.0", + "contained-holder": [ + "SUBRACK-1.17.0.0" + ], + "tree-level": 2, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "91T403003322", + "part-type-id": "1AB187280031", + "model-identifier": "mod2", + "type-name": "a2.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/IDU-1.55.0.0", + "_score": 1, + "_source": { + "description": "MWR-ng Dir#5.5-Ch#1", + "date": "2014-01-15T00:00:00.0Z", + "version": "MWR-ng", + "node-id": "sim1", + "uuid": "IDU-1.55.0.0", + "parent-uuid": "network-element", + "contained-holder": [ + "PORT-1.55.1.2", + "PORT-1.55.1.4" + ], + "tree-level": 0, + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serie2017-14", + "part-type-id": "3DB76047BAAA02", + "model-identifier": "model-id-s3s", + "type-name": "MWR-ng" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/CARD-1.1.1.0", + "_score": 1, + "_source": { + "description": "WS/CORE-MAIN", + "date": "2015-08-17T00:00:00.0Z", + "version": "123", + "node-id": "sim1", + "uuid": "CARD-1.1.1.0", + "parent-uuid": "SHELF-1.1.0.0", + "contained-holder": [ + "PORT-1.1.1.6", + "PORT-1.1.1.5", + "PORT-1.1.1.8", + "PORT-1.1.1.7" + ], + "tree-level": 1, + "manufacturer-identifier": "SAN", + "serial": "asdf-asdasd-asd", + "part-type-id": "part-number-2", + "model-identifier": "model-id-2", + "type-name": "latest" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/CARD-1.1.5.0", + "_score": 1, + "_source": { + "description": "WS/p8.module", + "date": "2013-10-21T00:00:00.0Z", + "version": "234", + "node-id": "sim1", + "uuid": "CARD-1.1.5.0", + "parent-uuid": "SHELF-1.1.0.0", + "contained-holder": [ + "PORT-1.1.5.6", + "PORT-1.1.5.5", + "PORT-1.1.5.8", + "PORT-1.1.5.7" + ], + "tree-level": 1, + "manufacturer-identifier": "SAN", + "serial": "africa", + "part-type-id": "part-number-12", + "model-identifier": "model-id-12", + "type-name": "p8.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim1/a2.module-1.1.5.6", + "_score": 1, + "_source": { + "description": "WS/p8.module/a2.module#6", + "date": "", + "version": "", + "node-id": "sim1", + "uuid": "a2.module-1.1.5.6", + "parent-uuid": "CARD-1.1.5.0", + "contained-holder": [ + "SUBRACK-1.56.0.0" + ], + "tree-level": 2, + "manufacturer-identifier": "", + "serial": "", + "part-type-id": "", + "model-identifier": "", + "type-name": "a2.module" + } + }, + { + "_index": "inventoryequipment-v5", + "_type": "_doc", + "_id": "sim2/a2.module-1.1.5.6", + "_score": 1, + "_source": { + "description": "WS/p8.module/a2.module#6", + "date": "", + "version": "", + "node-id": "sim2", + "uuid": "a2.module-1.1.5.6", + "parent-uuid": "network-element", + "contained-holder": [ + "SUBRACK-1.56.0.0" + ], + "tree-level": 0, + "manufacturer-identifier": "", + "serial": "", + "part-type-id": "", + "model-identifier": "", + "type-name": "a2.module" + } + } +]
\ No newline at end of file diff --git a/sdnr/wt/data-provider/provider/src/test/resources/TestTree/test2.json b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/test2.json new file mode 100644 index 000000000..3697258bc --- /dev/null +++ b/sdnr/wt/data-provider/provider/src/test/resources/TestTree/test2.json @@ -0,0 +1,490 @@ +[ + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/a2.module-1.1.1.8", + "_score": 1.0498221, + "_source": { + "version": "a2.module-newest", + "node-id": "netconf_server_simulator", + "uuid": "a2.module-1.1.1.8", + "contained-holder": [ + "SUBRACK-1.18.0.0" + ], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "01T441601301", + "part-type-id": "1AB376720002", + "model-identifier": "NGI7AMLMAA", + "tree-level": 2, + "parent-uuid": "CARD-1.1.1.0", + "date": "2010-02-05T00:00:00.0Z", + "type-name": "a2.module", + "description": "WS/CORE-MAIN/a2.module#8" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/CARD-1.1.9.0", + "_score": 1.0498221, + "_source": { + "version": "wind", + "node-id": "netconf_server_simulator", + "uuid": "CARD-1.1.9.0", + "contained-holder": [], + "manufacturer-identifier": "CIT", + "serial": "proto-type", + "part-type-id": "party-yea", + "model-identifier": "model-id-s3s", + "tree-level": 1, + "parent-uuid": "SHELF-1.1.0.0", + "date": "2007-02-19T00:00:00.0Z", + "type-name": "wind", + "description": "WS/wind" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/a2.module-1.65.1.2", + "_score": 1.0498221, + "_source": { + "version": "a2.module-newest", + "node-id": "netconf_server_simulator", + "uuid": "a2.module-1.65.1.2", + "contained-holder": [], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "310330008", + "part-type-id": "3EM23141AD01", + "model-identifier": "CRPQABVFAA", + "tree-level": 1, + "parent-uuid": "IDU-1.65.0.0", + "date": "2013-04-13T00:00:00.0Z", + "type-name": "a2.module", + "description": "MWR#65Ch#1/a2.moduletraff" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/SHELF-1.1.0.0", + "_score": 0.7985077, + "_source": { + "version": "a2.module-newest", + "node-id": "netconf_server_simulator", + "uuid": "SHELF-1.1.0.0", + "contained-holder": [ + "SLOT-1.1.1.0", + "SLOT-1.1.2.0", + "SLOT-1.1.3.0", + "SLOT-1.1.4.0", + "SLOT-1.1.5.0", + "SLOT-1.1.6.0", + "SLOT-1.1.7.0", + "SLOT-1.1.8.0", + "SLOT-1.1.9.0" + ], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serial1", + "part-type-id": "Partnumber", + "model-identifier": "model-id", + "tree-level": 0, + "parent-uuid": "network-element", + "date": "2017-09-09T00:00:00.0Z", + "type-name": "WS-8", + "description": "WS-8" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/CARD-1.1.1.0", + "_score": 0.7985077, + "_source": { + "version": "123", + "node-id": "netconf_server_simulator", + "uuid": "CARD-1.1.1.0", + "contained-holder": [ + "PORT-1.1.1.6", + "PORT-1.1.1.5", + "PORT-1.1.1.8", + "PORT-1.1.1.7" + ], + "manufacturer-identifier": "SAN", + "serial": "asdf-asdasd-asd", + "part-type-id": "part-number-2", + "model-identifier": "model-id-2", + "tree-level": 1, + "parent-uuid": "SHELF-1.1.0.0", + "date": "2015-08-17T00:00:00.0Z", + "type-name": "latest", + "description": "WS/CORE-MAIN" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/CARD-1.1.6.0", + "_score": 0.7985077, + "_source": { + "version": "234", + "node-id": "netconf_server_simulator", + "uuid": "CARD-1.1.6.0", + "contained-holder": [ + "PORT-1.1.6.5", + "PORT-1.1.6.7", + "PORT-1.1.6.6", + "PORT-1.1.6.8" + ], + "manufacturer-identifier": "SAN", + "serial": "serial-number-124", + "part-type-id": "part-number-12", + "model-identifier": "model-id-12", + "tree-level": 1, + "parent-uuid": "SHELF-1.1.0.0", + "date": "2013-11-23T00:00:00.0Z", + "type-name": "p8.module", + "description": "WS/p8.module" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/a2.module-1.55.1.2", + "_score": 0.7985077, + "_source": { + "version": "a2.module-newest", + "node-id": "netconf_server_simulator", + "uuid": "a2.module-1.55.1.2", + "contained-holder": [], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "310330015", + "part-type-id": "3EM23141AD01", + "model-identifier": "CRPQABVFAA", + "tree-level": 1, + "parent-uuid": "IDU-1.55.0.0", + "date": "2013-04-13T00:00:00.0Z", + "type-name": "a2.module", + "description": "MWR#55Ch#1/a2.moduletraff" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/a2.module-1.1.5.5", + "_score": 0.6931471, + "_source": { + "version": "a2.module-newest", + "node-id": "netconf_server_simulator", + "uuid": "a2.module-1.1.5.5", + "contained-holder": [ + "SUBRACK-1.55.0.0" + ], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "310330015", + "part-type-id": "3EM23141AD01", + "model-identifier": "CRPQABVFAA", + "tree-level": 2, + "parent-uuid": "CARD-1.1.5.0", + "date": "2013-04-13T00:00:00.0Z", + "type-name": "a2.module", + "description": "WS/p8.module/a2.module#5" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/a2.module-1.1.6.5", + "_score": 0.6931471, + "_source": { + "version": "a2.module-newest", + "node-id": "netconf_server_simulator", + "uuid": "a2.module-1.1.6.5", + "contained-holder": [ + "SUBRACK-1.65.0.0" + ], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "310330008", + "part-type-id": "3EM23141AD01", + "model-identifier": "CRPQABVFAA", + "tree-level": 2, + "parent-uuid": "CARD-1.1.6.0", + "date": "2013-04-13T00:00:00.0Z", + "type-name": "a2.module", + "description": "WS/p8.module/a2.module#5" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/CARD-1.1.7.0", + "_score": 0.6931471, + "_source": { + "version": "p1.module", + "node-id": "netconf_server_simulator", + "uuid": "CARD-1.1.7.0", + "contained-holder": [], + "manufacturer-identifier": "CIT", + "serial": "serial-number-s3s", + "part-type-id": "part-number-s3s", + "model-identifier": "model-id-s3s", + "tree-level": 1, + "parent-uuid": "SHELF-1.1.0.0", + "date": "2007-08-27T00:00:00.0Z", + "type-name": "p1.module_A", + "description": "WS/DS1" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/CARD-1.65.1.4", + "_score": 0.6931471, + "_source": { + "version": "2017", + "node-id": "netconf_server_simulator", + "uuid": "CARD-1.65.1.4", + "contained-holder": [], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serie2017-13", + "part-type-id": "partNo2017-12", + "model-identifier": "model-id-s3s", + "tree-level": 1, + "parent-uuid": "IDU-1.65.0.0", + "date": "2014-01-08T00:00:00.0Z", + "type-name": "RxDiv", + "description": "MWR#55Ch#0/RxDiv" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/a2.module-1.1.1.5", + "_score": 0.5260931, + "_source": { + "version": "a2.module-newest", + "node-id": "netconf_server_simulator", + "uuid": "a2.module-1.1.1.5", + "contained-holder": [ + "SUBRACK-1.15.0.0" + ], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "0003548168", + "part-type-id": "3FE25774AA01", + "model-identifier": "VAUIAEYAAA", + "tree-level": 2, + "parent-uuid": "CARD-1.1.1.0", + "date": "2005-11-09T00:00:00.0Z", + "type-name": "a2.module", + "description": "WS/CORE-MAIN/a2.module#5" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/a2.module-1.1.1.7", + "_score": 0.5260931, + "_source": { + "version": "a2.module-newest", + "node-id": "netconf_server_simulator", + "uuid": "a2.module-1.1.1.7", + "contained-holder": [ + "SUBRACK-1.17.0.0" + ], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "91T403003322", + "part-type-id": "1AB187280031", + "model-identifier": "mod2", + "tree-level": 2, + "parent-uuid": "CARD-1.1.1.0", + "date": "2009-01-19T00:00:00.0Z", + "type-name": "a2.module", + "description": "WS/CORE-MAIN/a2.module#7" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/CARD-1.1.8.0", + "_score": 0.5260931, + "_source": { + "version": "unknown", + "node-id": "netconf_server_simulator", + "uuid": "CARD-1.1.8.0", + "contained-holder": [], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "sd-dsa-eqw", + "part-type-id": "unknown", + "model-identifier": "model-id-s3s", + "tree-level": 1, + "parent-uuid": "SHELF-1.1.0.0", + "date": "2008-10-21T00:00:00.0Z", + "type-name": "p4.module", + "description": "WS/DS3" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/ODU-1.56.0.0", + "_score": 0.5260931, + "_source": { + "version": "extrem-hyper", + "node-id": "netconf_server_simulator", + "uuid": "ODU-1.56.0.0", + "contained-holder": [ + "PORT-1.56.1.2", + "PORT-1.56.1.3", + "PORT-1.56.1.4" + ], + "manufacturer-identifier": "", + "serial": "", + "part-type-id": "", + "model-identifier": "", + "tree-level": 0, + "parent-uuid": "network-element", + "date": "", + "type-name": "MWR-hyper", + "description": "MWR-hyper Dir#5.6-Ch#1" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/a2.module-1.56.1.2", + "_score": 0.5260931, + "_source": { + "version": "a2.module-newest", + "node-id": "netconf_server_simulator", + "uuid": "a2.module-1.56.1.2", + "contained-holder": [], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serial1", + "part-type-id": "Partnumber", + "model-identifier": "model-id", + "tree-level": 1, + "parent-uuid": "ODU-1.56.0.0", + "date": "2017-09-09T00:00:00.0Z", + "type-name": "a2.module", + "description": "MWR#56Ch#1/a2.moduletraff" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/IDU-1.65.0.0", + "_score": 0.5260931, + "_source": { + "version": "MWR-ng", + "node-id": "netconf_server_simulator", + "uuid": "IDU-1.65.0.0", + "contained-holder": [ + "PORT-1.65.1.4", + "PORT-1.65.1.2" + ], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "WAUZZI", + "part-type-id": "3DB76047BAAA02", + "model-identifier": "model-id-s3s", + "tree-level": 0, + "parent-uuid": "network-element", + "date": "2014-01-16T00:00:00.0Z", + "type-name": "MWR-ng", + "description": "MWR-ng Dir#6.5-Ch#1" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/CARD-1.1.5.0", + "_score": 0.44183272, + "_source": { + "version": "234", + "node-id": "netconf_server_simulator", + "uuid": "CARD-1.1.5.0", + "contained-holder": [ + "PORT-1.1.5.6", + "PORT-1.1.5.5", + "PORT-1.1.5.8", + "PORT-1.1.5.7" + ], + "manufacturer-identifier": "SAN", + "serial": "africa", + "part-type-id": "part-number-12", + "model-identifier": "model-id-12", + "tree-level": 1, + "parent-uuid": "SHELF-1.1.0.0", + "date": "2013-10-21T00:00:00.0Z", + "type-name": "p8.module", + "description": "WS/p8.module" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/a2.module-1.1.5.6", + "_score": 0.44183272, + "_source": { + "version": "", + "node-id": "netconf_server_simulator", + "uuid": "a2.module-1.1.5.6", + "contained-holder": [ + "SUBRACK-1.56.0.0" + ], + "manufacturer-identifier": "", + "serial": "", + "part-type-id": "", + "model-identifier": "", + "tree-level": 2, + "parent-uuid": "CARD-1.1.5.0", + "date": "", + "type-name": "a2.module", + "description": "WS/p8.module/a2.module#6" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/IDU-1.55.0.0", + "_score": 0.44183272, + "_source": { + "version": "MWR-ng", + "node-id": "netconf_server_simulator", + "uuid": "IDU-1.55.0.0", + "contained-holder": [ + "PORT-1.55.1.2", + "PORT-1.55.1.4" + ], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serie2017-14", + "part-type-id": "3DB76047BAAA02", + "model-identifier": "model-id-s3s", + "tree-level": 0, + "parent-uuid": "network-element", + "date": "2014-01-15T00:00:00.0Z", + "type-name": "MWR-ng", + "description": "MWR-ng Dir#5.5-Ch#1" + } + }, + { + "_index": "inventoryequipment-v4", + "_type": "_doc", + "_id": "netconf_server_simulator/CARD-1.55.1.4", + "_score": 0.44183272, + "_source": { + "version": "2017", + "node-id": "netconf_server_simulator", + "uuid": "CARD-1.55.1.4", + "contained-holder": [], + "manufacturer-identifier": "ONF-Wireless-Transport", + "serial": "Serie2017-12", + "part-type-id": "partNo2017-12", + "model-identifier": "model-id-s3s", + "tree-level": 1, + "parent-uuid": "IDU-1.55.0.0", + "date": "2014-01-07T00:00:00.0Z", + "type-name": "RxDiv", + "description": "MWR#55Ch#1/RxDiv" + } + } +]
\ No newline at end of file diff --git a/sdnr/wt/data-provider/setup/pom.xml b/sdnr/wt/data-provider/setup/pom.xml index 15af214fd..d5a64a3e5 100644 --- a/sdnr/wt/data-provider/setup/pom.xml +++ b/sdnr/wt/data-provider/setup/pom.xml @@ -62,12 +62,12 @@ <artifactId>commons-cli</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -133,7 +133,6 @@ </execution> </executions> <configuration> - <finalName>sdnr-dmt</finalName> <appendAssemblyId>false</appendAssemblyId> <archive> <manifest> @@ -145,7 +144,6 @@ </descriptorRefs> </configuration> </plugin> - </plugins> </build> </project> diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/ReleaseInformation.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/ReleaseInformation.java index 913313b86..8362b0030 100644 --- a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/ReleaseInformation.java +++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/ReleaseInformation.java @@ -35,6 +35,7 @@ import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.frankfurt.FrankfurtRel import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.frankfurt.FrankfurtReleaseInformationR2; import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.guilin.GuilinReleaseInformation; import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.honolulu.HonoluluReleaseInformation; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.istanbul.IstanbulReleaseInformation; public abstract class ReleaseInformation { @@ -145,6 +146,8 @@ public abstract class ReleaseInformation { return new GuilinReleaseInformation(); case HONOLULU_R1: return new HonoluluReleaseInformation(); + case ISTANBUL_R1: + return new IstanbulReleaseInformation(); default: return null; } diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/ComponentName.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/ComponentName.java index c3974b98a..956f74b2d 100644 --- a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/ComponentName.java +++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/ComponentName.java @@ -25,10 +25,11 @@ public enum ComponentName { CONNECTIONLOG("connectionlog"), EVENTLOG("eventlog"), FAULTLOG("faultlog"), FAULTCURRENT( "faultcurrent"), HISTORICAL_PERFORMANCE_15M("historicalperformance15m"), HISTORICAL_PERFORMANCE_24H( - "historicalperformance24h"), INVENTORY( - "inventory"), INVENTORYTOPLEVEL("inventorytoplevel"), MAINTENANCE( - "maintenance"), MEDIATOR_SERVER("mediator-server"), REQUIRED_NETWORKELEMENT( - "required-networkelement"), GUICUTTHROUGH("guicutthrough"); + "historicalperformance24h"), INVENTORY("inventory"), INVENTORYTOPLEVEL( + "inventorytoplevel"), MAINTENANCE("maintenance"), MEDIATOR_SERVER( + "mediator-server"), REQUIRED_NETWORKELEMENT( + "required-networkelement"), GUICUTTHROUGH( + "guicutthrough"), USERDATA("userdata"); private final String value; diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/Release.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/Release.java index 9b67bd46b..119479b97 100644 --- a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/Release.java +++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/Release.java @@ -30,9 +30,10 @@ public enum Release { FRANKFURT_R1("frankfurt-R1", "-v2", new EsVersion(6, 4, 3), new EsVersion(6, 8, 6)), FRANKFURT_R2("frankfurt-R2", "-v3", new EsVersion(7, 0, 1), new EsVersion(7, 6, 1)), GUILIN_R1("guilin-R1", "-v4", new EsVersion(7,1,1), new EsVersion(7,6,1)), - HONOLULU_R1("honolulu-R1", "-v5", new EsVersion(7,1,1), new EsVersion(8,0,0), false); + HONOLULU_R1("honolulu-R1", "-v5", new EsVersion(7,1,1), new EsVersion(8,0,0), false), + ISTANBUL_R1("istanbul-R1", "-v6", new EsVersion(7,1,1), new EsVersion(8,0,0), false); - public static final Release CURRENT_RELEASE = Release.HONOLULU_R1; + public static final Release CURRENT_RELEASE = Release.ISTANBUL_R1; private final String value; private final String dbSuffix; diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/ReleaseGroup.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/ReleaseGroup.java index 6d2da9035..664dce677 100644 --- a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/ReleaseGroup.java +++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/data/ReleaseGroup.java @@ -31,9 +31,10 @@ import org.onap.ccsdk.features.sdnr.wt.common.database.data.EsVersion; */ public enum ReleaseGroup { - EL_ALTO(Release.EL_ALTO), FRANKFURT(Release.FRANKFURT_R1, Release.FRANKFURT_R2), GUILIN(Release.GUILIN_R1), HONOLULU(Release.HONOLULU_R1); + EL_ALTO(Release.EL_ALTO), FRANKFURT(Release.FRANKFURT_R1, Release.FRANKFURT_R2), GUILIN( + Release.GUILIN_R1), HONOLULU(Release.HONOLULU_R1), ISTANBUL(Release.ISTANBUL_R1); - public static final ReleaseGroup CURRENT_RELEASE = HONOLULU; + public static final ReleaseGroup CURRENT_RELEASE = ISTANBUL; private final List<Release> releases; diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/honolulu/HonoluluReleaseInformation.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/honolulu/HonoluluReleaseInformation.java index 255a031e7..41f8175db 100644 --- a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/honolulu/HonoluluReleaseInformation.java +++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/honolulu/HonoluluReleaseInformation.java @@ -45,7 +45,7 @@ public class HonoluluReleaseInformation extends ReleaseInformation { } - private static Map<ComponentName, DatabaseInfo> createDBMap() { + public static Map<ComponentName, DatabaseInfo> createDBMap() { Map<ComponentName, DatabaseInfo> map= FrankfurtReleaseInformationR2.createDBMap(); map.put(ComponentName.GUICUTTHROUGH, new DatabaseInfo7("guicutthrough", "guicutthrough", "{\"name\": {\"type\": \"keyword\"},\"weburi\": {\"type\": \"keyword\"}}")); diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/istanbul/IstanbulReleaseInformation.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/istanbul/IstanbulReleaseInformation.java new file mode 100644 index 000000000..67200bb2f --- /dev/null +++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/istanbul/IstanbulReleaseInformation.java @@ -0,0 +1,78 @@ +/* + * ============LICENSE_START======================================================= + * ONAP : ccsdk features + * ================================================================================ + * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. + * All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + * + */ +package org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.istanbul; + +import java.io.IOException; +import java.util.Map; +import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient; +import org.onap.ccsdk.features.sdnr.wt.common.database.requests.ClusterSettingsRequest; +import org.onap.ccsdk.features.sdnr.wt.common.database.responses.ClusterSettingsResponse; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.ReleaseInformation; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.ComponentName; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.DatabaseInfo; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.DatabaseInfo7; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.KeepDataSearchHitConverter; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.Release; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.SearchHitConverter; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.honolulu.HonoluluReleaseInformation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class IstanbulReleaseInformation extends ReleaseInformation { + + private final Logger LOG = LoggerFactory.getLogger(IstanbulReleaseInformation.class); + public IstanbulReleaseInformation() { + super(Release.ISTANBUL_R1,createDBMap()); + + } + + private static Map<ComponentName, DatabaseInfo> createDBMap() { + Map<ComponentName, DatabaseInfo> map= HonoluluReleaseInformation.createDBMap(); + map.put(ComponentName.USERDATA, new DatabaseInfo7("userdata", "userdata", "{}")); + return map; + } + + @Override + public SearchHitConverter getConverter(Release dst, ComponentName comp) { + if (dst == Release.ISTANBUL_R1) { + return new KeepDataSearchHitConverter(comp); + } + return null; + } + + @Override + protected boolean runPreInitCommands(HtDatabaseClient dbClient) { + ClusterSettingsResponse response = null; + try { + response = dbClient.setupClusterSettings(new ClusterSettingsRequest(false).maxCompilationsPerMinute(400)); + } catch (IOException e) { + LOG.warn("problem setting up cluster: {}", e); + } + return response == null ? false : response.isAcknowledged(); + } + + @Override + protected boolean runPostInitCommands(HtDatabaseClient dbClient) { + return true; + } + +} diff --git a/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestMigrationProvider.java b/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestMigrationProvider.java index aaa33839f..311582a08 100644 --- a/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestMigrationProvider.java +++ b/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestMigrationProvider.java @@ -42,7 +42,7 @@ public class TestMigrationProvider { @Test public void testCreateImport() throws Exception { DataMigrationProviderImpl provider = new DataMigrationProviderImpl(hosts, null, null, true, 5000); - + DataMigrationReport report=null; try { @@ -51,11 +51,13 @@ public class TestMigrationProvider { fail("unable to init database"); } //import data into database - DataMigrationReport report = provider.importData(FRANKFURT_BACKUP_FILE, false, Release.FRANKFURT_R2); - assertTrue(report.completed()); - assertEquals(Release.CURRENT_RELEASE, provider.autoDetectRelease()); + report = provider.importData(FRANKFURT_BACKUP_FILE, false, Release.FRANKFURT_R2); } catch (Exception e) { + e.printStackTrace(); fail(e.getMessage()); } + assertTrue(report.completed()); + assertEquals(Release.CURRENT_RELEASE, provider.autoDetectRelease()); + } } diff --git a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml index 48927a388..835528a9a 100644 --- a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml +++ b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml @@ -50,7 +50,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-websocketmanager2-feature</artifactId> + <artifactId>sdnr-wt-websocketmanager-feature</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> @@ -90,12 +90,5 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-devicemanager-adapter-manager-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> </dependencies> </project> diff --git a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml index 9c5bf7e3e..b8fb6bcc4 100644 --- a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml +++ b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml @@ -43,41 +43,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-apigateway-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-websocketmanager2-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-data-provider-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-netconfnode-state-service-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-devicemanager-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>sdnr-wt-devicemanager-oran-feature</artifactId> <version>${project.version}</version> <type>xml</type> @@ -106,20 +71,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-mountpoint-registrar-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-mountpoint-state-provider-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>sdnr-wt-devicemanager-adapter-manager-feature</artifactId> <version>${project.version}</version> <type>xml</type> diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml index bc07537ec..9a4465b47 100644 --- a/sdnr/wt/featureaggregator/feature/pom.xml +++ b/sdnr/wt/featureaggregator/feature/pom.xml @@ -57,7 +57,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-websocketmanager2-feature</artifactId> + <artifactId>sdnr-wt-websocketmanager-feature</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml index 819b7a144..d4fd6dfb9 100755 --- a/sdnr/wt/featureaggregator/installer/pom.xml +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -41,6 +41,7 @@ <name>ccsdk-features :: ${project.artifactId}</name> <properties> + <application.name>sdnr-wt-installer</application.name> </properties> <dependencies> @@ -72,6 +73,12 @@ <type>xml</type> <classifier>features</classifier> </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-data-provider-setup</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> <build> @@ -159,30 +166,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-sdnr-data-migration-tool</id> - <goals> - <goal>copy-resources</goal> - </goals> - <phase>validate</phase> - <configuration> - <outputDirectory>${project.build.directory}/assembly/system/org/onap/ccsdk/features/sdnr/wt/sdnr-wt-data-provider-setup/${project.version}</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../../data-provider/setup/target</directory> - <includes> - <include>sdnr-dmt.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml index 9f575b4b4..a86bb09d6 100644 --- a/sdnr/wt/helpserver/provider/pom.xml +++ b/sdnr/wt/helpserver/provider/pom.xml @@ -46,11 +46,6 @@ <dependencies> <dependency> - <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> - <artifactId>sdnr-wt-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </dependency> @@ -75,7 +70,12 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-common</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/sdnr/wt/mountpoint-registrar/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/test/TestPNFMountPointClient.java b/sdnr/wt/mountpoint-registrar/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/test/TestPNFMountPointClient.java index 591ed5b24..ad87c20d7 100644 --- a/sdnr/wt/mountpoint-registrar/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/test/TestPNFMountPointClient.java +++ b/sdnr/wt/mountpoint-registrar/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/test/TestPNFMountPointClient.java @@ -42,7 +42,7 @@ public class TestPNFMountPointClient extends PNFMountPointClient { testClient = new TestPNFMountPointClient(); testClient.setAuthorization("admin", "admin"); assertEquals(true, - testClient.pnfMountPointCreate("TEST_50001", "127.0.0.1", "TLS", "key_id", "admin", "admin", "17380")); + testClient.pnfMountPointCreate("TEST 50001", "127.0.0.1", "TLS", "key_id", "admin", "admin", "17380")); assertEquals(true, testClient.pnfMountPointCreate("TEST_50001", "127.0.0.1", "SSH", "key_id", "admin", "admin", "17380")); @@ -52,7 +52,7 @@ public class TestPNFMountPointClient extends PNFMountPointClient { @Nonnull public BaseHTTPResponse sendRequest(String uri, String method, String body, Map<String, String> headers) throws IOException { - System.out.println("In overridden sendRequest in TestPNFMountPointClient"); + System.out.println("In overridden sendRequest in TestPNFMountPointClient, uri = "+uri); return new BaseHTTPResponse(200, body); } diff --git a/sdnr/wt/oauth-provider/provider-jar/src/main/java/org/onap/ccsdk/features/sdnr/wt/oauthprovider/http/AuthHttpServlet.java b/sdnr/wt/oauth-provider/provider-jar/src/main/java/org/onap/ccsdk/features/sdnr/wt/oauthprovider/http/AuthHttpServlet.java index 9a9f4fc04..cd4239081 100644 --- a/sdnr/wt/oauth-provider/provider-jar/src/main/java/org/onap/ccsdk/features/sdnr/wt/oauthprovider/http/AuthHttpServlet.java +++ b/sdnr/wt/oauth-provider/provider-jar/src/main/java/org/onap/ccsdk/features/sdnr/wt/oauthprovider/http/AuthHttpServlet.java @@ -37,11 +37,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.ShiroException; import org.apache.shiro.codec.Base64; -import org.apache.shiro.session.Session; -import org.apache.shiro.subject.Subject; import org.jolokia.osgi.security.Authenticator; import org.onap.ccsdk.features.sdnr.wt.common.http.BaseHTTPClient; import org.onap.ccsdk.features.sdnr.wt.oauthprovider.data.Config; @@ -70,7 +66,7 @@ public class AuthHttpServlet extends HttpServlet { private static final long serialVersionUID = 1L; private static final String BASEURI = "/oauth"; private static final String LOGINURI = BASEURI + "/login"; - private static final String LOGOUTURI = BASEURI + "/logout"; + //private static final String LOGOUTURI = BASEURI + "/logout"; private static final String PROVIDERSURI = BASEURI + "/providers"; public static final String REDIRECTURI = BASEURI + "/redirect"; private static final String REDIRECTURI_FORMAT = REDIRECTURI + "/%s"; @@ -141,8 +137,6 @@ public class AuthHttpServlet extends HttpServlet { this.sendResponse(resp, HttpServletResponse.SC_OK, getConfigs(this.providerStore.values())); } else if (req.getRequestURI().startsWith(LOGINURI)) { this.handleLoginRedirect(req, resp); - } else if (req.getRequestURI().equals(LOGOUTURI)) { - this.handleLogout(req, resp); } else if (POLICIESURI.equals(req.getRequestURI())) { this.sendResponse(resp, HttpServletResponse.SC_OK, this.getPoliciesForUser(req)); } else if (req.getRequestURI().startsWith(REDIRECTURI)) { @@ -152,10 +146,7 @@ public class AuthHttpServlet extends HttpServlet { } } - private void handleLogout(HttpServletRequest req, HttpServletResponse resp) throws IOException { - this.logout(); - this.sendResponse(resp, HttpServletResponse.SC_OK,""); - } + private void handleLoginRedirect(HttpServletRequest req, HttpServletResponse resp) throws IOException { final String uri = req.getRequestURI(); final Matcher matcher = LOGIN_REDIRECT_PATTERN.matcher(uri); @@ -467,16 +458,5 @@ public class AuthHttpServlet extends HttpServlet { os.write(output); } - private void logout() { - final Subject subject = SecurityUtils.getSubject(); - try { - subject.logout(); - Session session = subject.getSession(false); - if (session != null) { - session.stop(); - } - } catch (ShiroException e) { - LOG.debug("Couldn't log out {}", subject, e); - } - } + } diff --git a/sdnr/wt/readthedocs/pom.xml b/sdnr/wt/readthedocs/pom.xml index 5af916bff..b7f9030e4 100644 --- a/sdnr/wt/readthedocs/pom.xml +++ b/sdnr/wt/readthedocs/pom.xml @@ -32,13 +32,13 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-readthedocs-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features :: ${project.artifactId}</name> <properties> - <application.name>sdnr-wt-apigateway</application.name> + <application.name>sdnr-wt-readthedocs-installer</application.name> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> |