2 files changed, 0 insertions, 139 deletions
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineInsQueryTool.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineInsQueryTool.java
deleted file mode 100644
index 36b5b6f..0000000
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineInsQueryTool.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright 2017 ZTE Corporation.
- * <p>
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- */
-package org.onap.holmes.rulemgt.msb;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.jvnet.hk2.annotations.Service;
-import org.onap.holmes.common.api.entity.ServiceEntity;
-import org.onap.holmes.common.api.entity.ServiceNode4Query;
-import org.onap.holmes.common.config.MicroServiceConfig;
-import org.onap.holmes.common.utils.GsonUtil;
-import org.onap.holmes.common.utils.HttpsUtils;
-
-import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-@Service
-@Slf4j
-public class EngineInsQueryTool {
-
-    private String url;
-
-    @PostConstruct
-    public void init() {
-        String[] msbAddrInfo = MicroServiceConfig.getMsbIpAndPort();
-        url = String.format("http://%s:%s/api/microservices/v1/services/holmes-engine-mgmt/version/v1",
-                msbAddrInfo[0], msbAddrInfo[1]);
-    }
-
-    public List<String> getInstanceList() throws Exception {
-        String response;
-        HttpGet httpGet = new HttpGet(url);
-        try (CloseableHttpClient httpClient = HttpsUtils.getConditionalHttpsClient(HttpsUtils.DEFUALT_TIMEOUT)) {
-            HttpResponse httpResponse = HttpsUtils.get(httpGet, new HashMap<>(), httpClient);
-            response = HttpsUtils.extractResponseEntity(httpResponse);
-        } catch (Exception e) {
-            throw e;
-        } finally {
-            httpGet.releaseConnection();
-
-        }
-        ServiceEntity service = GsonUtil.jsonToBean(response, ServiceEntity.class);
-        List<ServiceNode4Query> nodesList = service.getNodes();
-        List<String> ipList = new ArrayList<>();
-        for (ServiceNode4Query node : nodesList) {
-            ipList.add(node.getIp());
-        }
-        return ipList;
-
-    }
-
-}
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/MsbQuery.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/MsbQuery.java
deleted file mode 100644
index df0783d..0000000
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/MsbQuery.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2017-2020 ZTE Corporation.
- * <p>
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- */
-package org.onap.holmes.rulemgt.msb;
-
-import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;
-import org.onap.holmes.rulemgt.send.Ip4AddingRule;
-import org.onap.holmes.rulemgt.send.RuleAllocator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-public class MsbQuery {
-
-    static final private Logger log = LoggerFactory.getLogger(MsbQuery.class);
-    final private RuleAllocator ruleAllocator;
-    private Ip4AddingRule ip4AddingRule;
-    private EngineInsQueryTool engineInsQueryTool;
-
-    public MsbQuery() {
-        ruleAllocator = new RuleAllocator();
-        ip4AddingRule = ServiceLocatorHolder.getLocator().getService(Ip4AddingRule.class);
-        engineInsQueryTool = ServiceLocatorHolder.getLocator().getService(EngineInsQueryTool.class);
-    }
-
-    public void startTimer() {
-        try {
-            new Timer().schedule(new TimerTask() {
-
-                public void run() {
-                    try {
-                        List<String> timerIpList = engineInsQueryTool.getInstanceList();
-                        log.info(String.format("There are %d engine instance(s) running currently.", timerIpList.size()));
-
-                        ip4AddingRule.setIpList(timerIpList);
-                        ruleAllocator.allocateRules(timerIpList);
-                    } catch (Exception e) {
-                        log.error("The timing query engine instance failed ", e);
-                    }
-                }
-
-            }, SECONDS.toMillis(10), SECONDS.toMillis(30));
-        } catch (Exception e) {
-            log.error("MSBQuery startTimer timer task failed !" + e.getMessage(), e);
-            try {
-                SECONDS.sleep(30);
-            } catch (InterruptedException e1) {
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-}