# 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.
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.
## 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)
Web applications for user operations for devices
-## websocketmanager2 (osgi)
+## websocketmanager (osgi)
Notification service for browser clients.
*/
List<String> getAllNodesWithCurrentAlarms();
- /**
- * 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);
<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>
* @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();
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());
/**
* @param devType
- * @param mountMethod
* @param nodename3
* @return
*/
--- /dev/null
+/*
+ * ============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());
+ }
+ }
+}
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;
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;
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);
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");
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)));
}
}
+++ /dev/null
- {
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
-{
- "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
+++ /dev/null
-{
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
-{
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
-{
- "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
+++ /dev/null
-{
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
-{
- "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
+++ /dev/null
- {
- "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
+++ /dev/null
-{
- "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
+++ /dev/null
-{
- "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
+++ /dev/null
- {
- "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
--- /dev/null
+[
+ {
+ "_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
--- /dev/null
+[
+ {
+ "_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
<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>
</execution>
</executions>
<configuration>
- <finalName>sdnr-dmt</finalName>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
</descriptorRefs>
</configuration>
</plugin>
-
</plugins>
</build>
</project>
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 {
return new GuilinReleaseInformation();
case HONOLULU_R1:
return new HonoluluReleaseInformation();
+ case ISTANBUL_R1:
+ return new IstanbulReleaseInformation();
default:
return null;
}
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;
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;
*/
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;
}
- 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\"}}"));
--- /dev/null
+/*
+ * ============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;
+ }
+
+}
@Test
public void testCreateImport() throws Exception {
DataMigrationProviderImpl provider = new DataMigrationProviderImpl(hosts, null, null, true, 5000);
-
+ DataMigrationReport report=null;
try {
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());
+
}
}
</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>
<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>
<name>ccsdk-features :: ${project.artifactId}</name>
<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>
<type>xml</type>
<classifier>features</classifier>
</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>
</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>
<name>ccsdk-features :: ${project.artifactId}</name>
<properties>
+ <application.name>sdnr-wt-installer</application.name>
</properties>
<dependencies>
<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>
</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>
</properties>
<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>
<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>
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"));
@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);
}
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;
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";
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)) {
}
}
- 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);
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);
- }
- }
+
}
<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>