summaryrefslogtreecommitdiffstats
path: root/controlloop/common/msb
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-02-07 13:53:26 -0500
committerJim Hahn <jrh3@att.com>2019-02-08 09:20:22 -0500
commit04124d27fdfa38e4fc417c361f5f63000cb42a8f (patch)
tree18ea9ca0b45f479c8e3b7ee264ec8d74bd08b3a4 /controlloop/common/msb
parent0c1084282ae62cbe9d5b054057aed1b759dc82cd (diff)
Remove msb project from drools-applications
The msb project is no longer needed, so it has been removed. Change-Id: I54b9e2210f11a3c95479fbb83e0564afdfbc5728 Issue-ID: POLICY-1429 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/msb')
-rw-r--r--controlloop/common/msb/pom.xml76
-rw-r--r--controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceException.java42
-rw-r--r--controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceFactory.java125
-rw-r--r--controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceManager.java60
-rw-r--r--controlloop/common/msb/src/main/java/org/onap/policy/msb/client/Node.java55
-rw-r--r--controlloop/common/msb/src/main/resources/msb.policy.properties22
-rw-r--r--controlloop/common/msb/src/test/java/org/onap/policy/msb/client/MsbServiceExceptionTest.java31
-rw-r--r--controlloop/common/msb/src/test/java/org/onap/policy/msb/client/MsbServiceManagerTest.java173
-rw-r--r--controlloop/common/msb/src/test/java/org/onap/policy/msb/client/NodeTest.java63
-rw-r--r--controlloop/common/msb/src/test/resources/msbPropertyFile.properties21
10 files changed, 0 insertions, 668 deletions
diff --git a/controlloop/common/msb/pom.xml b/controlloop/common/msb/pom.xml
deleted file mode 100644
index 43c2cde91..000000000
--- a/controlloop/common/msb/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
- ============LICENSE_START=======================================================
- drools-pdp-apps
- ================================================================================
- Copyright (C) 2017-2018 AT&T 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=========================================================
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
- <artifactId>common</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>msb</artifactId>
-
- <dependencies>
- <!--
- CLM security issue force use of databind 2.9.5
- from msb
- -->
- <dependency>
- <groupId>org.onap.msb.java-sdk</groupId>
- <artifactId>msb-java-sdk</artifactId>
- <version>1.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.common</groupId>
- <artifactId>utils-test</artifactId>
- <version>${version.policy.common}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceException.java b/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceException.java
deleted file mode 100644
index ebd2e32ff..000000000
--- a/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright 2017-2018 ZTE, Inc. and others.
- *
- * 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.policy.msb.client;
-
-public class MsbServiceException extends Exception {
- private static final long serialVersionUID = 5227416822833497317L;
-
- public MsbServiceException() {
- super();
- }
-
- public MsbServiceException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
- super(message, cause, enableSuppression, writableStackTrace);
- }
-
- public MsbServiceException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public MsbServiceException(String message) {
- super(message);
- }
-
- public MsbServiceException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceFactory.java b/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceFactory.java
deleted file mode 100644
index c2868a263..000000000
--- a/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceFactory.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright 2017-2018 ZTE, Inc. and others.
- *
- * 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.policy.msb.client;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Properties;
-
-import org.onap.msb.sdk.discovery.common.RouteException;
-import org.onap.msb.sdk.discovery.entity.MicroServiceFullInfo;
-import org.onap.msb.sdk.discovery.entity.NodeInfo;
-import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MsbServiceFactory implements Serializable {
- private static final long serialVersionUID = 4638414146278012425L;
- private static final Logger logger = LoggerFactory.getLogger(MsbServiceFactory.class);
- private static final String MSB_PROPERTY_FILE = "msb.policy.properties";
- private static final String MSB_IP = "msb.ip";
- private static final String MSB_PORT = "msb.port";
- private transient MSBServiceClient msbClient;
- private Properties properties;
-
- /**
- * Construct an instance.
- *
- * @throws MsbServiceException if an error occurs
- * @throws IOException if an IO error occurs
- */
- public MsbServiceFactory() throws MsbServiceException, IOException {
- this.init();
- this.msbClient = new MSBServiceClient(properties.getProperty(MSB_IP),
- Integer.parseInt(properties.getProperty(MSB_PORT)));
- }
-
- public MsbServiceFactory(MSBServiceClient msbClient) {
- this.msbClient = msbClient;
- }
-
- private void init() throws MsbServiceException, IOException {
- properties = new Properties();
- String propertyFilePath = System.getProperty(MSB_PROPERTY_FILE);
- if (propertyFilePath == null) {
- throw new MsbServiceException("No msb.policy.properties specified.");
- }
- Path file = Paths.get(propertyFilePath);
- if (!file.toFile().exists()) {
- throw new MsbServiceException("No msb.policy.properties specified.");
- }
-
- if (!Files.isReadable(file)) {
- throw new MsbServiceException("Repository is NOT readable: " + file.toAbsolutePath());
- }
- try (InputStream is = new FileInputStream(file.toFile())) {
- properties.load(is);
- }
- }
-
-
- public Node getNode(String serviceName, String version) {
- return this.build(serviceName, version);
- }
-
- /**
- * Get the node for the given actor.
- *
- * @param actor the actor
- * @return the node
- */
- public Node getNode(String actor) {
- Node node = null;
- switch (actor) {
- case "AAI":
- node = this.build("aai-search", "v11");
- return node;
- case "SO":
- node = this.build("so", "v2");
- return node;
- case "VFC":
- node = this.build("nfvo-nslcm", "v1");
- return node;
- case "SDNC":
- node = this.build("sdnc-nslcm", "v10"); //... ???
- return node;
- default:
- logger.info("MSBServiceManager: policy has an unknown actor.");
- }
- return node;
- }
-
- private Node build(String serviceName, String version) {
- Node node = new Node();
- node.setName(serviceName);
- try {
- MicroServiceFullInfo serviceInfo = msbClient.queryMicroServiceInfo(serviceName, version);
- for (NodeInfo nodeInfo : serviceInfo.getNodes()) {
- node.setIp(nodeInfo.getIp());
- node.setPort(nodeInfo.getPort());
- }
- } catch (RouteException e) {
- logger.info("MSBServiceManager:", e);
- }
- return node;
- }
-}
diff --git a/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceManager.java b/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceManager.java
deleted file mode 100644
index b94992c28..000000000
--- a/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/MsbServiceManager.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright 2017-2018 ZTE, Inc. and others.
- *
- * 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.policy.msb.client;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
-
-public class MsbServiceManager implements Serializable {
- private static final long serialVersionUID = -2517971308551895215L;
- private MsbServiceFactory factory;
-
- public MsbServiceManager() throws MsbServiceException, IOException {
- this.factory = new MsbServiceFactory();
- }
-
- public MsbServiceManager(MSBServiceClient msbClient) {
-
- this.factory = new MsbServiceFactory(msbClient);
- }
-
- /**
- * Get the IP and port of the components registered in the MSB.
- *
- * @param actor AAI or SO or VFC or SNDC
- * @return the node
- */
- public Node getNode(String actor) {
-
- return factory.getNode(actor);
- }
-
- /**
- * Get the IP and port of the components registered in the MSB.
- *
- * @param serviceName the service name registered in the MSB
- * @param version the service version registered in the MSB
- * @return the node
- */
- public Node getNode(String serviceName, String version) {
-
- return factory.getNode(serviceName, version);
- }
-
-}
diff --git a/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/Node.java b/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/Node.java
deleted file mode 100644
index f42b82e3c..000000000
--- a/controlloop/common/msb/src/main/java/org/onap/policy/msb/client/Node.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright 2017-2018 ZTE, Inc. and others.
- *
- * 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.policy.msb.client;
-
-import java.io.Serializable;
-
-public class Node implements Serializable {
- private static final long serialVersionUID = -5028618045561310837L;
- private String name;
- private String ip;
- private String port;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- public String getPort() {
- return port;
- }
-
- public void setPort(String port) {
- this.port = port;
- }
-
- @Override
- public String toString() {
- return "Node{" + "name='" + name + '\'' + ", ip='" + ip + '\'' + ", port='" + port + '\'' + '}';
- }
-}
diff --git a/controlloop/common/msb/src/main/resources/msb.policy.properties b/controlloop/common/msb/src/main/resources/msb.policy.properties
deleted file mode 100644
index bb372ec85..000000000
--- a/controlloop/common/msb/src/main/resources/msb.policy.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP-PDP
-# ================================================================================
-# Copyright (C) 2017 AT&T 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=========================================================
-###
-
-msb.ip=127.0.0.1
-msb.port=10081 \ No newline at end of file
diff --git a/controlloop/common/msb/src/test/java/org/onap/policy/msb/client/MsbServiceExceptionTest.java b/controlloop/common/msb/src/test/java/org/onap/policy/msb/client/MsbServiceExceptionTest.java
deleted file mode 100644
index 059eecdee..000000000
--- a/controlloop/common/msb/src/test/java/org/onap/policy/msb/client/MsbServiceExceptionTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. 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.policy.msb.client;
-
-import org.junit.Test;
-import org.onap.policy.common.utils.test.ExceptionsTester;
-
-public class MsbServiceExceptionTest extends ExceptionsTester {
-
- @Test
- public void test() throws Exception {
- test(MsbServiceException.class);
- }
-
-}
diff --git a/controlloop/common/msb/src/test/java/org/onap/policy/msb/client/MsbServiceManagerTest.java b/controlloop/common/msb/src/test/java/org/onap/policy/msb/client/MsbServiceManagerTest.java
deleted file mode 100644
index 32025fb3c..000000000
--- a/controlloop/common/msb/src/test/java/org/onap/policy/msb/client/MsbServiceManagerTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright 2017-2018 ZTE, Inc. and others.
- *
- * 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.policy.msb.client;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.onap.msb.sdk.discovery.common.RouteException;
-import org.onap.msb.sdk.discovery.entity.MicroServiceFullInfo;
-import org.onap.msb.sdk.discovery.entity.NodeInfo;
-import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
-
-public class MsbServiceManagerTest {
- @Mock
- private MSBServiceClient msbClient;
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
- private MsbServiceManager msbManager;
-
- public MsbServiceManagerTest() {}
-
- @BeforeClass
- public static void setUpClass() {}
-
- @AfterClass
- public static void tearDownClass() {}
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- msbManager = new MsbServiceManager(msbClient);
- }
-
- @After
- public void tearDown() {}
-
- @Test
- public void testByActor() throws RouteException, UnknownHostException {
- MicroServiceFullInfo serviceInfo =
- MsbServiceManagerTest.build(InetAddress.getLocalHost().getHostAddress(), "8843");
- when(msbClient.queryMicroServiceInfo("aai-search", "v11")).thenReturn(serviceInfo);
- Node node = msbManager.getNode("AAI");
- assertNotNull(node);
- serviceInfo = MsbServiceManagerTest.build(InetAddress.getLocalHost().getHostAddress(), "8840");
- when(msbClient.queryMicroServiceInfo("so", "v2")).thenReturn(serviceInfo);
- node = msbManager.getNode("SO");
- assertNotNull(node);
-
- serviceInfo = MsbServiceManagerTest.build(InetAddress.getLocalHost().getHostAddress(), "8082");
- when(msbClient.queryMicroServiceInfo("nfvo-nslcm", "v1")).thenReturn(serviceInfo);
- node = msbManager.getNode("VFC");
- assertNotNull(node);
-
- }
-
- @Test
- public void testByActor_when_actorNotExist_returnNull() throws RouteException, UnknownHostException {
- MicroServiceFullInfo serviceInfo =
- MsbServiceManagerTest.build(InetAddress.getLocalHost().getHostAddress(), "8843");
- when(msbClient.queryMicroServiceInfo("aai-search", "v11")).thenReturn(serviceInfo);
- Node node = msbManager.getNode("DDD");
- assertNull(node);
- }
-
- @Test
- public void testByServiceNameAndVersion() throws RouteException, UnknownHostException {
- MicroServiceFullInfo serviceInfo =
- MsbServiceManagerTest.build(InetAddress.getLocalHost().getHostAddress(), "8843");
- when(msbClient.queryMicroServiceInfo("aai-search", "v11")).thenReturn(serviceInfo);
- Node node = msbManager.getNode("aai-search", "v11");
- assertNotNull(node);
- }
-
- @Test
- public void testByServiceNameAndVersion_when_serice_notRegistedToMsb() throws RouteException, UnknownHostException {
- MsbServiceManagerTest.build(InetAddress.getLocalHost().getHostAddress(), "8843");
- when(msbClient.queryMicroServiceInfo("aai-search", "v11")).thenThrow(new RouteException());
- Node node = msbManager.getNode("aai-search", "v11");
- assertNotNull(node);
- assertTrue(node.getName() == "aai-search");
- assertTrue(node.getIp() == null);
- assertTrue(node.getPort() == null);
- }
-
- @Test
- public void testReadMsbPolicyProperites_noPropertyFileSpecifed_throwsException()
- throws MsbServiceException, IOException {
- expectedException.expect(MsbServiceException.class);
- expectedException.expectMessage("No msb.policy.properties specified.");
- System.clearProperty("msb.policy.properties");
- msbManager = new MsbServiceManager();
- }
-
- @Test
- public void testReadMsbPolicyProperites_propertyFileDoesNotExist_throwsException()
- throws MsbServiceException, IOException {
- expectedException.expect(MsbServiceException.class);
- expectedException.expectMessage("No msb.policy.properties specified.");
- System.setProperty("msb.policy.properties", "nonExistingPropertyFile.txt");
- msbManager = new MsbServiceManager();
- System.clearProperty("msb.policy.properties");
- }
-
- @Test
- public void testReadMsbPolicyProperites_propertyFileExists() throws MsbServiceException, IOException,
- NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
- System.setProperty("msb.policy.properties", "src/test/resources/msbPropertyFile.properties");
- msbManager = new MsbServiceManager();
- System.clearProperty("msb.policy.properties");
-
- Field factoryField = msbManager.getClass().getDeclaredField("factory");
- factoryField.setAccessible(true);
- MsbServiceFactory msbServiceFactory = (MsbServiceFactory) factoryField.get(msbManager);
-
- Field msbClientField = msbServiceFactory.getClass().getDeclaredField("msbClient");
- msbClientField.setAccessible(true);
- MSBServiceClient msbClient = (MSBServiceClient) msbClientField.get(msbServiceFactory);
- assertEquals("127.0.0.1:20", msbClient.getMsbSvrAddress());
- }
-
- /**
- * Build a micro service info.
- *
- * @param ip the up address
- * @param port the port number
- * @return the MicroServiceFullInfo
- */
- public static MicroServiceFullInfo build(String ip, String port) {
- Set<NodeInfo> nodes = new HashSet<NodeInfo>();
- NodeInfo node = new NodeInfo();
- node.setPort(port);
- node.setIp(ip);
- nodes.add(node);
- MicroServiceFullInfo serviceInfo = new MicroServiceFullInfo();
- serviceInfo.setNodes(nodes);
- return serviceInfo;
- }
-}
diff --git a/controlloop/common/msb/src/test/java/org/onap/policy/msb/client/NodeTest.java b/controlloop/common/msb/src/test/java/org/onap/policy/msb/client/NodeTest.java
deleted file mode 100644
index 7419bbe34..000000000
--- a/controlloop/common/msb/src/test/java/org/onap/policy/msb/client/NodeTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2018 Ericsson. 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.policy.msb.client;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class NodeTest {
-
- @Test
- public void testSetAndGetName() {
- Node node = new Node();
- final String name = "myName";
- node.setName(name);
- assertEquals(name, node.getName());
- }
-
- @Test
- public void testSetAndGetIp() {
- Node node = new Node();
- final String ip = "127.0.0.1";
- node.setIp(ip);
- assertEquals(ip, node.getIp());
- }
-
- @Test
- public void testSetAndGetPort() {
- Node node = new Node();
- final String port = "1001";
- node.setPort(port);
- assertEquals(port, node.getPort());
- }
-
- @Test
- public void testToString() {
- Node node = new Node();
- final String name = "myName";
- final String ip = "127.0.0.1";
- final String port = "1001";
- node.setName(name);
- node.setIp(ip);
- node.setPort(port);
- assertEquals("Node{name='myName', ip='127.0.0.1', port='1001'}", node.toString());
- }
-
-}
diff --git a/controlloop/common/msb/src/test/resources/msbPropertyFile.properties b/controlloop/common/msb/src/test/resources/msbPropertyFile.properties
deleted file mode 100644
index 8d392de56..000000000
--- a/controlloop/common/msb/src/test/resources/msbPropertyFile.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2017-2018 AT&T 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=========================================================
-###
-msb.ip=127.0.0.1
-msb.port=20 \ No newline at end of file