5 files changed, 0 insertions, 304 deletions
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