From 010cceb3af02f25875f0a98ef8511e29fd33efc4 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 5 May 2017 21:15:27 +0000 Subject: [DCAE-14]VESservicemanager update Change-Id: I77440cbf1ec8e3eee712f2c0796ef61542fca654 Signed-off-by: Vijay --- ...rviceStandardeventcollectorManagerProvider.java | 792 +++++++++++---------- 1 file changed, 408 insertions(+), 384 deletions(-) (limited to 'dcae-controller-service/dcae-controller-service-standardeventcollector') diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java index 7922c0d..7709ca5 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java @@ -9,7 +9,7 @@ * 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 + * 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, @@ -18,7 +18,7 @@ * limitations under the License. * ============LICENSE_END============================================ */ - + package org.openecomp.dcae.controller.service.standardeventcollector.servers.manager; @@ -28,26 +28,18 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.man import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; -import org.openecomp.ncomp.sirius.manager.IRequestHandler; -import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; -import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.utils.ShellCmd; import org.apache.log4j.Logger; -import org.eclipse.emf.common.util.EList; import org.json.JSONObject; import org.json.JSONArray; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; @@ -58,7 +50,6 @@ import java.util.List; import java.util.concurrent.TimeoutException; import org.openecomp.dcae.controller.service.servers.dockermanager.DcaeDockerManagerProvider; -import org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl; import org.openecomp.dcae.controller.service.standardeventcollector.manager.ControllerServiceStandardeventcollectorManager; import org.openecomp.dcae.controller.core.service.HealthTestResponse; import org.openecomp.dcae.controller.core.service.HealthTestStatus; @@ -66,431 +57,464 @@ import org.openecomp.dcae.controller.core.service.impl.ServiceFactoryImpl; public class DcaeControllerServiceStandardeventcollectorManagerProvider extends DcaeDockerManagerProvider { - private static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorManagerProvider.class); - ControllerServiceStandardeventcollectorManager o; - - //private static final String HP_CH_CONFIG = "/etc/dcae/channel.json"; - private static final String DMAAP_CONFIG = "/etc/dcae/dmaap.conf"; + private static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorManagerProvider.class); + ControllerServiceStandardeventcollectorManager o; - //To be updated to docker localtion and remove _COPY reference - //private static final String HP_MAIN_CONFIG = "/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/HPProcessingConfig.json"; - //private static final String HP_MAIN_CONFIG_COPY = "/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/HPProcessingConfig.json.copy"; - private static final String HP_MAIN_CONFIG = "/opt/app/VESCollector/etc/DmaapConfig.json"; - //private static final String HP_MAIN_CONFIG_COPY = "/opt/app/SEC/etc/DmaapConfig.json"; - + private static final String DMAAP_CONFIG = "/etc/dcae/dmaap.conf"; + private static final String HP_MAIN_CONFIG = "/opt/app/VESCollector/etc/DmaapConfig.json"; - public DcaeControllerServiceStandardeventcollectorManagerProvider(ISiriusServer controller, ControllerServiceStandardeventcollectorManager o) { - super(controller, o); - this.o = o; - } + public DcaeControllerServiceStandardeventcollectorManagerProvider(ISiriusServer controller, ControllerServiceStandardeventcollectorManager o) { + super(controller, o); + this.o = o; + } private void executeCommand(String cmd) { // TODO Auto-generated method stub - Runtime run = Runtime.getRuntime(); - Process pr; - try { - pr = run.exec(cmd); - pr.waitFor(); - BufferedReader buf = new BufferedReader(new InputStreamReader(pr.getInputStream())); - String line = ""; - while ((line = buf.readLine()) != null) { - System.out.println("line is " +line); - System.out.println("updated the config successfully"); - } - } catch (IOException | InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + Runtime run = Runtime.getRuntime(); + Process pr; + try { + pr = run.exec(cmd); + pr.waitFor(); + BufferedReader buf = new BufferedReader(new InputStreamReader(pr.getInputStream())); + String line = ""; + while ((line = buf.readLine()) != null) { + System.out.println("line is " +line); + System.out.println("updated the config successfully"); + } + } catch (IOException | InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } - /** **/ - @Override - public HealthTestResponse test() { - super.start(); - HealthTestResponse resp = new ServiceFactoryImpl().createHealthTestResponse(); - String cmdOutput = ""; - try { - ShellCmd c = new ShellCmd("/opt/app/VESCollector/bin/VESrestfulCollector_Status.sh"); - String s = c.result(60000); - int i = s.indexOf("\n"); - System.out.println("DEBUG:HealthTestResponse i:" + i + " String S:" + s); - cmdOutput = i > 0 ? s.substring(0,i + 1) : s; - } catch (IOException | InterruptedException | TimeoutException e) { - System.out.println("HealthCheck test execution FAILED"); - // TODO Auto-generated catch block - e.printStackTrace(); - } - - System.out.println("test() VESCollecter check " + cmdOutput); - if (cmdOutput.startsWith("VESCollecter_Is_Running ")) { - resp.setStatus(HealthTestStatus.GREEN); - resp.setMessageCode("OK"); - logger.error("HealthTest: VESCollecter_Is_Running"); - System.out.println("INFO: HealthTest: VESCollecter_Is_Running"); - } else if (cmdOutput.startsWith("VESCollecter_Is_HavingError")) { - resp.setStatus(HealthTestStatus.YELLOW); - resp.setMessageCode("ERROR: VESCollecter_Is_HavingError"); - logger.error("HealthTest: VESCollecter_Is_HavingError"); - System.out.println("ERROR: HealthTest: VESCollecter_Is_HavingError"); - } else { - resp.setStatus(HealthTestStatus.RED); - resp.setMessageCode("ERROR: VESCollecter_Is_Not_Running"); - logger.error("HealthTest: VESCollecter_Is_Not_Running"); - System.out.println("ERROR: HealthTest: VESCollecter_Is_Not_Running"); - } - - return resp; - } + /** **/ + @Override + public HealthTestResponse test() { + super.start(); + HealthTestResponse resp = new ServiceFactoryImpl().createHealthTestResponse(); + String cmdOutput = ""; + try { + ShellCmd c = new ShellCmd("/opt/app/VESCollector/bin/VESrestfulCollector_Status.sh"); + String s = c.result(60000); + int i = s.indexOf("\n"); + System.out.println("DEBUG:HealthTestResponse i:" + i + " String S:" + s); + cmdOutput = i > 0 ? s.substring(0,i + 1) : s; + } catch (IOException | InterruptedException | TimeoutException e) { + System.out.println("HealthCheck test execution FAILED"); + // TODO Auto-generated catch block + e.printStackTrace(); + } + + System.out.println("test() VESCollecter check " + cmdOutput); + if (cmdOutput.startsWith("VESCollecter_Is_Running ")) { + resp.setStatus(HealthTestStatus.GREEN); + resp.setMessageCode("OK"); + logger.error("HealthTest: VESCollecter_Is_Running"); + System.out.println("INFO: HealthTest: VESCollecter_Is_Running"); + } else if (cmdOutput.startsWith("VESCollecter_Is_HavingError")) { + resp.setStatus(HealthTestStatus.YELLOW); + resp.setMessageCode("ERROR: VESCollecter_Is_HavingError"); + logger.error("HealthTest: VESCollecter_Is_HavingError"); + System.out.println("ERROR: HealthTest: VESCollecter_Is_HavingError"); + } else { + resp.setStatus(HealthTestStatus.RED); + resp.setMessageCode("ERROR: VESCollecter_Is_Not_Running"); + logger.error("HealthTest: VESCollecter_Is_Not_Running"); + System.out.println("ERROR: HealthTest: VESCollecter_Is_Not_Running"); + } + + return resp; + } @Override public void configurationChanged() { - // important to call the super methods for handling DMaaP setup. - super.configurationChanged(); - - try { - //Added to avoid timing issues and ensure dmaap.conf is updated - // by the call to super.configurationChanges before checking contents into it. - Thread.sleep(3000); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - System.out.println ("Sleep time expired"); - } - JSONArray charray = retrieveDmaapSetting(); - System.out.println("Modified HPchannel config:" + charray); - logger.info("Modified HPchannel config: " + charray); - - JSONObject channelconfig = new JSONObject(); - channelconfig.put("channels", charray); - updateJsonToHPConfig (HP_MAIN_CONFIG, HP_MAIN_CONFIG,charray); - - //For debug purpose - //writeJsonToFile(HP_CH_CONFIG, channelconfig); - //updateJsonToHPConfig (HP_MAIN_CONFIG, HP_MAIN_CONFIG_COPY,charray); - - - //Collector port - String cport = o.getCport(); - if (cport !=null) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "collector.service.port" +" "+ cport; - executeCommand(cmd); - } - - //Collector csecport - String csecport = o.getCsecport(); - if (csecport !=null) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "collector.service.secure.port" +" "+ csecport; - executeCommand(cmd); - } - - //Collector keystoreloc - String keystoreloc = o.getKeystoreloc(); - if (cport !=null) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "collector.keystore.file.location" +" "+ keystoreloc; - executeCommand(cmd); - } - - //Collector keystorepwdfile - String keystorepwdfile = o.getKeystorepwdloc(); - if (cport !=null) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "collector.keystore.passwordfile" +" "+ keystorepwdfile; - executeCommand(cmd); - } - - //Collector keystorealias - String keystorealias = o.getKeystorealias(); - if (cport !=null) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "collector.keystore.alias" +" "+ keystorealias; - executeCommand(cmd); - } - //Collector maxinputqueue - String maxinputqueue = o.getCport(); - if (cport !=null) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "collector.inputQueue.maxPending" +" "+ maxinputqueue; - executeCommand(cmd); - } - - //checkschemaflag - String checkschemaflag = o.getCheckschemaflag(); - if (checkschemaflag != null && !checkschemaflag.equals("")) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "collector.schema.checkflag" +" "+ checkschemaflag; - executeCommand(cmd); - - } else { - System.out.println("Schemaflag is null"); - } - - //authlist - replaces authid/pwd - String authlist = o.getAuthlist(); - if (authlist != null && !authlist.equals("")) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "header.authlist" +" "+ authlist; - executeCommand(cmd); - - } else { - System.out.println("authlist is null"); - } - - //StreamID - String streamid = o.getStreamid(); - if (streamid != null && !streamid.equals("")) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "collector.dmaap.streamid" +" "+ streamid; - executeCommand(cmd); - - } else { - System.out.println("streamid is null"); - } - - - - // schemafile - String schemafile = o.getSchemafile(); - if (schemafile != null && !schemafile.equals("")) { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "collector.schema.file" +" "+ schemafile; - executeCommand(cmd); - - } else { - System.out.println("Schemafile is null"); - } - - resume(); + // important to call the super methods for handling DMaaP setup. + super.configurationChanged(); + + try { + //Added to avoid timing issues and ensure dmaap.conf is updated + // by the call to super.configurationChanges before checking contents into it. + Thread.sleep(3000); + } catch (InterruptedException e) { + e.printStackTrace(); + System.out.println ("Sleep time expired"); + } + JSONArray charray = retrieveDmaapSetting(); + System.out.println("Modified HPchannel config:" + charray); + logger.info("Modified HPchannel config: " + charray); + + JSONObject channelconfig = new JSONObject(); + channelconfig.put("channels", charray); + updateJsonToHPConfig (HP_MAIN_CONFIG, HP_MAIN_CONFIG,charray); + + //For debug purpose + //writeJsonToFile(HP_CH_CONFIG, channelconfig); + //updateJsonToHPConfig (HP_MAIN_CONFIG, HP_MAIN_CONFIG_COPY,charray); + + + //Collector port + String cport = o.getCport(); + if (cport !=null) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.service.port" +" "+ cport; + executeCommand(cmd); + } + + //Collector csecport + String csecport = o.getCsecport(); + if (csecport !=null) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.service.secure.port" +" "+ csecport; + executeCommand(cmd); + } + + //Collector keystoreloc + String keystoreloc = o.getKeystoreloc(); + if (keystoreloc !=null) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.keystore.file.location" +" "+ keystoreloc; + executeCommand(cmd); + } + + //Collector keystorepwdfile + String keystorepwdfile = o.getKeystorepwdloc(); + if (keystorepwdfile !=null) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.keystore.passwordfile" +" "+ keystorepwdfile; + executeCommand(cmd); + } + + //Collector keystorealias + String keystorealias = o.getKeystorealias(); + if (keystorealias !=null) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.keystore.alias" +" "+ keystorealias; + executeCommand(cmd); + } + //Collector maxinputqueue + String maxinputqueue = o.getCport(); + if (maxinputqueue !=null) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.inputQueue.maxPending" +" "+ maxinputqueue; + executeCommand(cmd); + } + + //checkschemaflag + String checkschemaflag = o.getCheckschemaflag(); + if (checkschemaflag != null && !checkschemaflag.equals("")) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.schema.checkflag" +" "+ checkschemaflag; + executeCommand(cmd); + + } else { + System.out.println("Schemaflag is null"); + } + + //authflag + String authflag = o.getAuthflag(); + if (authflag != null && !authflag.equals("")) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "header.authflag" +" "+ authflag; + executeCommand(cmd); + + } else { + System.out.println("authlist is null"); + } + + //authlist - replaces authid/pwd + String authlist = o.getAuthlist(); + if (authlist != null && !authlist.equals("")) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "header.authlist" +" "+ authlist; + executeCommand(cmd); + + } else { + System.out.println("authlist is null"); + } + + //StreamID + String streamid = o.getStreamid(); + if (streamid != null && !streamid.equals("")) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.dmaap.streamid" +" "+ streamid; + executeCommand(cmd); + } else { + System.out.println("streamid is null"); + } + + // schemafile + String schemafile = o.getSchemafile(); + if (schemafile != null && !schemafile.equals("")) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.schema.file" +" "+ schemafile; + executeCommand(cmd); + + } else { + System.out.println("Schemafile is null"); + } + + resume(); } - + private JSONArray retrieveDmaapSetting() { - String fileName = DMAAP_CONFIG; + String fileName = DMAAP_CONFIG; - File f = new File(fileName); + File f = new File(fileName); - if (!f.exists() || !f.canRead() || f.isDirectory()) { - System.out.println("faile to open file: [" + fileName + "]"); - return null; - } + if (!f.exists() || !f.canRead() || f.isDirectory()) { + System.out.println("faile to open file: [" + fileName + "]"); + return null; + } - String jsonData = readFile(fileName); - JSONArray charray = new JSONArray(); - try { - JSONObject jobj = verifyJSON(jsonData); - JSONArray jarray = jobj.getJSONArray("dmaaps"); + String jsonData = readFile(fileName); + JSONArray charray = new JSONArray(); + try { + JSONObject jobj = verifyJSON(jsonData); + JSONArray jarray = jobj.getJSONArray("dmaaps"); - for (int i = 0; i < jarray.length(); i++) { - JSONObject tmpobj = jarray.getJSONObject(i); - System.out.println("tempobj:" + tmpobj); - JSONObject hpC = buildHpChannel(tmpobj); - charray.put(hpC); - } - } catch (Exception e) { - logger.warn("Failed_To_Get_DMaaP_Configuation: " + e); - } + for (int i = 0; i < jarray.length(); i++) { + JSONObject tmpobj = jarray.getJSONObject(i); + System.out.println("tempobj:" + tmpobj); + JSONObject hpC = buildHpChannel(tmpobj); + charray.put(hpC); + } + } catch (Exception e) { + logger.warn("Failed_To_Get_DMaaP_Configuation: " + e); + } - return charray; + return charray; } private String readFile(String fileName) { - String result = ""; - BufferedReader br = null; - try { - br = new BufferedReader(new FileReader(fileName)); - StringBuilder sb = new StringBuilder(); - String line = br.readLine(); - while (line != null) { - sb.append(line); - line = br.readLine(); - } - result = "{ \"dmaaps\":" + sb.toString() + "}"; - } catch (Exception e) { - System.out.println("Failed to read file: [" + fileName + "]"); - logger.warn("Failed_To_Get_DMaaP_Configuation from file [" + fileName + "]" + e); - e.printStackTrace(); - } finally { - if (null != br) { - try { - br.close(); - } catch (Exception e) { - logger.warn("readFile().BufferedReader cannot be closed"); - } - } - } - return result; + String result = ""; + BufferedReader br = null; + try { + br = new BufferedReader(new FileReader(fileName)); + StringBuilder sb = new StringBuilder(); + String line = br.readLine(); + while (line != null) { + sb.append(line); + line = br.readLine(); + } + result = "{ \"dmaaps\":" + sb.toString() + "}"; + } catch (Exception e) { + System.out.println("Failed to read file: [" + fileName + "]"); + logger.warn("Failed_To_Get_DMaaP_Configuation from file [" + fileName + "]" + e); + e.printStackTrace(); + } finally { + if (null != br) { + try { + br.close(); + } catch (Exception e) { + logger.warn("readFile().BufferedReader cannot be closed"); + } + } + } + return result; } private JSONObject verifyJSON(String data) { - JSONObject temp; - try { - temp = new JSONObject(data); - } catch (Exception e) { - temp = null; - e.printStackTrace(); - } - return temp; + JSONObject temp; + try { + temp = new JSONObject(data); + } catch (Exception e) { + temp = null; + e.printStackTrace(); + } + return temp; } private JSONObject buildHpChannel(JSONObject tmpObj) { - JSONObject hpC = new JSONObject(); - - String hpName; - String mrType = null; // UEB: in|out DMaaP: subscribe|publish - String mrClass = "HpCambriaOutputStream";// getDmaapClass(); - String mrUrl = null; - String sType = "HTTPS"; - String mrTopic = ""; - String hpGroup = ""; - String hpInstance = "0"; - String basicAuthUsername = null; // UEB apiKey, DMaaP: dmaapUserName - String basicAuthPassword = null; // DMaaP: dmaapPassword - String dmaapDataType = "message"; - - mrUrl = tmpObj.getString("dmaapUrl"); - String[] urlParts = dmaapUrlSplit(mrUrl); - - mrType = tmpObj.getString("dmaapAction"); - if (mrType.equals("publish")) { - mrType = "out"; - } else { - mrType = "in"; - mrClass = "HpCambriaInputStream";// getDmaapClass(); - } - - basicAuthUsername = tmpObj.getString("dmaapUserName"); - basicAuthPassword = tmpObj.getString("dmaapPassword"); - String dataTypeTmp = tmpObj.getString("dmaapDataType"); - if (!dmaapDataType.equals(dataTypeTmp)) { - System.out.println("Invalid DataType (non message) recieved" + dataTypeTmp ); - logger.warn("Invalid DataType (non message) recieved" + dataTypeTmp); - } - if (null != urlParts) { - mrUrl = urlParts[2]; - mrTopic = urlParts[4]; - if (mrType.equals("subscribe") || mrType.equals("in")) { - if (urlParts.length > 4) { - hpGroup = urlParts[5]; - } - if (urlParts.length > 4) { - hpInstance = urlParts[6]; - } - } - } - - hpName = tmpObj.getString("dmaapStreamId"); - - hpC.put("name", hpName); - hpC.put("type", mrType); - hpC.put("class", mrClass); - hpC.put("cambria.url", mrUrl); - hpC.put("cambria.topic", mrTopic); - hpC.put("cambria.connectionType", sType); - hpC.put("basicAuthUsername", basicAuthUsername); - hpC.put("basicAuthPassword", basicAuthPassword); - if (mrType.equals("out")) { - hpC.put("stripHpId", "true"); - } else { - hpC.put("cambria.group", hpGroup); - hpC.put("cambria.instance", hpInstance); - } - - return hpC; + + JSONObject hpC = new JSONObject(); + String hpName; + String mrType = null; // UEB: in|out DMaaP: subscribe|publish + String mrClass = "HpCambriaOutputStream";// getDmaapClass(); + String mrUrl = null; + String sType = "HTTPS"; + String mrTopic = ""; + String hpGroup = ""; + String hpInstance = "0"; + String basicAuthUsername = null; // UEB apiKey, DMaaP: dmaapUserName + String basicAuthPassword = null; // DMaaP: dmaapPassword + String dmaapDataType = "message"; + + mrUrl = tmpObj.getString("dmaapUrl"); + String[] urlParts = dmaapUrlSplit(mrUrl); + + mrType = tmpObj.getString("dmaapAction"); + if (mrType.equals("publish")) { + mrType = "out"; + } else { + mrType = "in"; + mrClass = "HpCambriaInputStream";// getDmaapClass(); + } + + hpName = tmpObj.getString("dmaapStreamId"); + hpC.put("name", hpName); + hpC.put("type", mrType); + hpC.put("class", mrClass); + + if (tmpObj.has("dmaapUserName") && tmpObj.has("dmaapPassword") ) + { + basicAuthPassword = tmpObj.getString("dmaapPassword"); + basicAuthUsername = tmpObj.getString("dmaapUserName"); + if (basicAuthUsername != null && !basicAuthUsername.equals("")) + { + if (basicAuthPassword != null && !basicAuthPassword.equals("")) + { + hpC.put("basicAuthUsername", basicAuthUsername); + hpC.put("basicAuthPassword", basicAuthPassword); + hpC.put("cambria.connectionType", sType); + } + } + + } + + String dataTypeTmp = tmpObj.getString("dmaapDataType"); + if (!dmaapDataType.equals(dataTypeTmp)) { + System.out.println("Invalid DataType (non message) recieved" + dataTypeTmp ); + logger.warn("Invalid DataType (non message) recieved" + dataTypeTmp); + } + if (null != urlParts) { + mrUrl = urlParts[2]; + + //DCAE internal dmaap topic convention + if (urlParts[3].equals("events")) + { + mrTopic = urlParts[4]; + hpC.put("cambria.url", mrUrl); + + } + else { + //ONAP dmaap topic convention + mrTopic = urlParts[3]; + String[] hostport = mrUrl.split(":"); + hpC.put("cambria.hosts", hostport[0]); + } + + if (mrType.equals("subscribe") || mrType.equals("in")) { + if (urlParts.length > 4) { + hpGroup = urlParts[5]; + } + if (urlParts.length > 4) { + hpInstance = urlParts[6]; + } + } + } + + hpC.put("cambria.topic", mrTopic); + + if (mrType.equals("out")) { + hpC.put("stripHpId", "true"); + } else { + hpC.put("cambria.group", hpGroup); + hpC.put("cambria.instance", hpInstance); + } + + return hpC; } private static void writeJsonToFile(String fileName, JSONObject obj) { - FileWriter file = null; - try { - - file = new FileWriter(fileName); - file.write(obj.toString(4)); - } catch (Exception e) { - System.out.println(" FileWriter Error: " + e); - } finally { - if (file != null) - try { - file.close(); - } catch (Exception fe) { - } - } + FileWriter file = null; + try { + + file = new FileWriter(fileName); + file.write(obj.toString(4)); + } catch (Exception e) { + System.out.println(" FileWriter Error: " + e); + } finally { + if (file != null) + try { + file.close(); + } catch (Exception fe) { + } + } } +/*** + * Dmaap url structure + * pub - https://:/events/.dmaap.., + * sub - https://:/events/.dmaap../G1/u1"; + * + * Onap url structure + * pub - http://:/., + */ + private String[] dmaapUrlSplit(String dmUrl) { - String[] multUrls = dmUrl.split(","); - - StringBuffer newUrls = new StringBuffer(); - String urlParts[] = null; - for (int i = 0; i < multUrls.length; i++) { - urlParts = multUrls[i].split("/"); - if (i == 0) { - newUrls = newUrls.append(urlParts[2]); - } else { - newUrls = newUrls.append(",").append(urlParts[2]); - } - } - return urlParts; + String[] multUrls = dmUrl.split(","); + + StringBuffer newUrls = new StringBuffer(); + String urlParts[] = null; + for (int i = 0; i < multUrls.length; i++) { + urlParts = multUrls[i].split("/"); + if (i == 0) { + newUrls = newUrls.append(urlParts[2]); + } else { + newUrls = newUrls.append(",").append(urlParts[2]); + } + } + return urlParts; } private void updateJsonToHPConfig(String sourceName,String targetfile, JSONArray obj) { - String jsonData = readFile(sourceName); - JSONObject jobj = verifyJSON(jsonData); - //JSONArray jarray = jobj.getJSONArray("dmaaps"); - JSONObject job = jobj.getJSONObject("dmaaps"); - - - - job.remove("channels"); - job.put("channels", obj); - writeJsonToFile(targetfile, job); - + String jsonData = readFile(sourceName); + JSONObject jobj = verifyJSON(jsonData); + JSONObject job = jobj.getJSONObject("dmaaps"); + + + + job.remove("channels"); + job.put("channels", obj); + writeJsonToFile(targetfile, job); + } - - - - @Override - public void start() { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "start"; + + + + @Override + public void start() { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "start"; executeCommand(cmd); - // TODO IMPLEMENT - // throw new UnsupportedOperationException(); - } - - @Override - public void suspend() { - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "stop"; - executeCommand(cmd); - } - - @Override - public void resume() { - - String cmd=""; - cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "stop"; - executeCommand(cmd); - - cmd=""; - cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "start"; + // TODO IMPLEMENT + // throw new UnsupportedOperationException(); + } + + @Override + public void suspend() { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "stop"; + executeCommand(cmd); + } + + @Override + public void resume() { + + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "stop"; + executeCommand(cmd); + + cmd=""; + cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "start"; executeCommand(cmd); // TODO IMPLEMENT - // throw new UnsupportedOperationException(); - } + // throw new UnsupportedOperationException(); + } + - } -- cgit 1.2.3-korg