diff options
Diffstat (limited to 'integration/src/main')
9 files changed, 0 insertions, 642 deletions
diff --git a/integration/src/main/java/org/openo/portal/bean/MsbRegisterBean.java b/integration/src/main/java/org/openo/portal/bean/MsbRegisterBean.java deleted file mode 100644 index 8dd9ef3b..00000000 --- a/integration/src/main/java/org/openo/portal/bean/MsbRegisterBean.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2016-2017, CMCC Technologies Co., Ltd. - * - * 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. - */ -package org.openo.portal.bean; - -import java.util.List; - -public class MsbRegisterBean { - private String serviceName = ""; - - private String lb_policy = ""; - - private String url = ""; - - private String protocol = ""; - - private String visualRange = ""; - - private List<ServiceNodeBean> nodes; - - public String getServiceName() { - return serviceName; - } - - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } - - public String getLb_policy() { - return lb_policy; - } - - public void setLb_policy(String lb_policy) { - this.lb_policy = lb_policy; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getProtocol() { - return protocol; - } - - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - public String getVisualRange() { - return visualRange; - } - - public void setVisualRange(String visualRange) { - this.visualRange = visualRange; - } - - public List<ServiceNodeBean> getNodes() { - return nodes; - } - - public void setNodes(List<ServiceNodeBean> nodes) { - this.nodes = nodes; - } -} diff --git a/integration/src/main/java/org/openo/portal/bean/ServiceNodeBean.java b/integration/src/main/java/org/openo/portal/bean/ServiceNodeBean.java deleted file mode 100644 index d0ae6fa1..00000000 --- a/integration/src/main/java/org/openo/portal/bean/ServiceNodeBean.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2016-2017, CMCC Technologies Co., Ltd. - * - * 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. - */ -package org.openo.portal.bean; - -public class ServiceNodeBean { - private String ip = ""; - - private String port = ""; - - private int ttl = 0; - - 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; - } - - public int getTtl() { - return ttl; - } - - public void setTtl(int ttl) { - this.ttl = ttl; - } -} diff --git a/integration/src/main/java/org/openo/portal/system/CommonUtil.java b/integration/src/main/java/org/openo/portal/system/CommonUtil.java deleted file mode 100644 index e07388d4..00000000 --- a/integration/src/main/java/org/openo/portal/system/CommonUtil.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2016-2017, CMCC Technologies Co., Ltd. - * - * 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. - */ -package org.openo.portal.system; - -public class CommonUtil { - - public static boolean isEmpty(String str) { - if (null == str || "".equals(str.trim())) { - return true; - } else { - return false; - } - } -} diff --git a/integration/src/main/java/org/openo/portal/system/Constants.java b/integration/src/main/java/org/openo/portal/system/Constants.java deleted file mode 100644 index ff31de5b..00000000 --- a/integration/src/main/java/org/openo/portal/system/Constants.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2016-2017, CMCC Technologies Co., Ltd. - * - * 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. - */ -package org.openo.portal.system; - -public class Constants { - public final static String MARK_COLON = ":"; -} diff --git a/integration/src/main/java/org/openo/portal/system/RegisterService.java b/integration/src/main/java/org/openo/portal/system/RegisterService.java deleted file mode 100644 index ec6c9ce4..00000000 --- a/integration/src/main/java/org/openo/portal/system/RegisterService.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright 2016-2017, CMCC Technologies Co., Ltd. - * - * 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. - */ -package org.openo.portal.system; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - -import net.sf.json.JSONObject; - -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.util.EntityUtils; -import org.apache.commons.httpclient.HttpStatus; -import org.dom4j.Document; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; -import org.openo.portal.bean.MsbRegisterBean; -import org.openo.portal.bean.ServiceNodeBean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class RegisterService { - - private final static Logger logger = LoggerFactory.getLogger(RegisterService.class); - - public static HashMap<String, String> msbHostMap = new HashMap<String, String>(); - public static List<HashMap<String, String>> registerList = new ArrayList<HashMap<String, String>>(); - - public static void registerMsb(String configPath) { - File inputXml = new File(configPath); - SAXReader saxReader = new SAXReader(); - - try { - Document document = saxReader.read(inputXml); - Element rootNode = document.getRootElement(); - getMsbHostInfo(rootNode); - getRegisterList(rootNode); - - String url = msbHostMap.get("hostIp") + Constants.MARK_COLON + msbHostMap.get("hostPort") + msbHostMap.get("msbApiRootDomain"); - for (int i = 0; i < registerList.size(); i++) { - HashMap<String, String> registerInfo = registerList.get(i); - - ServiceNodeBean serviceNode = new ServiceNodeBean(); - serviceNode.setIp(registerInfo.get("ip")); - serviceNode.setPort(registerInfo.get("port")); - serviceNode.setTtl(Integer.valueOf(registerInfo.get("ttl"))); - List<ServiceNodeBean> nodeList = new ArrayList<ServiceNodeBean>(); - nodeList.add(serviceNode); - - MsbRegisterBean registerBean = new MsbRegisterBean(); - registerBean.setNodes(nodeList); - registerBean.setServiceName(registerInfo.get("serviceName")); - registerBean.setUrl(registerInfo.get("url")); - registerBean.setProtocol(registerInfo.get("protocol")); - registerBean.setVisualRange(registerInfo.get("visualRange")); - registerBean.setLb_policy(registerInfo.get("lb_policy")); - - JSONObject registerObj = JSONObject.fromObject(registerBean); - String registerResponse = registerPortalService(registerBean.getServiceName(), url, registerObj, ""); - } - logger.info("open-o portal register task succeeded."); - } catch (Exception e){ - logger.error("open-o portal register task failed."); - logger.error(e.getMessage()); - } - } - - private static void getMsbHostInfo(Element rootNode) { - Element msbHostNode = rootNode.element("msbHost"); - Iterator iter = msbHostNode.elementIterator(); - - while (iter.hasNext()) { - Element element = (Element) iter.next(); - msbHostMap.put(element.getName(), element.getText()); - } - } - - private static void getRegisterList(Element rootNode) { - Element registerListNode = rootNode.element("registerList"); - Iterator iRegisterList = registerListNode.elementIterator(); - - while (iRegisterList.hasNext()) { - HashMap<String, String> registerMap = new HashMap<String, String>(); - Element registerInfo = (Element) iRegisterList.next(); - Iterator iRegisterInfo = registerInfo.elementIterator(); - - while (iRegisterInfo.hasNext()) { - Element element = (Element) iRegisterInfo.next(); - registerMap.put(element.getName(), element.getText()); - } - registerList.add(registerMap); - } - } - - private static String registerPortalService(String serviceName, String url, JSONObject json, String token) { - DefaultHttpClient client = new DefaultHttpClient(); - HttpPost post = new HttpPost(url); - String response = null; - - try { - if (null != json) { - StringEntity s = new StringEntity(json.toString()); - s.setContentEncoding("UTF-8"); - s.setContentType("application/json"); - post.setEntity(s); - } - if (!CommonUtil.isEmpty(token)) { - post.addHeader("X-Auth-Token", token); - } - HttpResponse res = client.execute(post); - if (res.getStatusLine().getStatusCode() == HttpStatus.SC_OK - || res.getStatusLine().getStatusCode() == HttpStatus.SC_CREATED) { - String result = EntityUtils.toString(res.getEntity()); - if (!CommonUtil.isEmpty(result)) { - response = result; - } else { - response = null; - } - } - logger.info("register task [" + serviceName + "] completed successfully."); - } catch (Exception e) { - logger.error("register task [" + serviceName + "] failed because of errors."); - logger.error(e.getMessage()); - } - - return response; - } -} diff --git a/integration/src/main/java/org/openo/portal/system/SystemListener.java b/integration/src/main/java/org/openo/portal/system/SystemListener.java deleted file mode 100644 index a896c82f..00000000 --- a/integration/src/main/java/org/openo/portal/system/SystemListener.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2016-2017, CMCC Technologies Co., Ltd. - * - * 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. - */ -package org.openo.portal.system; - -import java.io.File; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class SystemListener implements ServletContextListener { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - public void contextDestroyed(ServletContextEvent sce) { - } - - public void contextInitialized(ServletContextEvent servletContextEvent) { - logger.info("open-o portal register task begin."); - String registerFilePath = SystemListener.class.getClassLoader().getResource("").getPath() + "portalConfig" + File.separator + "msb_register.xml"; - RegisterService.registerMsb(registerFilePath); - logger.info("open-o portal register task ended."); - } -} diff --git a/integration/src/main/resources/logback.xml b/integration/src/main/resources/logback.xml deleted file mode 100644 index bf07d3b2..00000000 --- a/integration/src/main/resources/logback.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<configuration debug="false" scan="true" scanPeriod="30 seconds"> - <property name="projectName" value="openoui"/> - <property name="logDir" value="../webapps/openoui/openoui_log"/> - <property name="maxHistory" value="30"/> - <timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/> - - <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern> - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - </pattern> - </encoder> - </appender> - - <appender name="errorAppender" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <level>ERROR</level> - <onMatch>ACCEPT</onMatch> - <onMismatch>DENY</onMismatch> - </filter> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${logDir}/error/error.%d{yyyy-MM}.log</fileNamePattern> - <maxHistory>${maxHistory}</maxHistory> - </rollingPolicy> - <encoder> - <pattern> - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - </pattern> - </encoder> - </appender> - - <appender name="warnAppender" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <level>WARN</level> - <onMatch>ACCEPT</onMatch> - <onMismatch>DENY</onMismatch> - </filter> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${logDir}/warn/warn.%d{yyyy-MM}.log</fileNamePattern> - <maxHistory>${maxHistory}</maxHistory> - </rollingPolicy> - <encoder> - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern> - </encoder> - </appender> - - <appender name="infoAppender" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <level>INFO</level> - <onMatch>ACCEPT</onMatch> - <onMismatch>DENY</onMismatch> - </filter> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${logDir}/info/info.%d{yyyy-MM}.log</fileNamePattern> - <maxHistory>${maxHistory}</maxHistory> - </rollingPolicy> - <encoder> - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern> - </encoder> - </appender> - - <appender name="debugAppender" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <level>DEBUG</level> - <onMatch>ACCEPT</onMatch> - <onMismatch>DENY</onMismatch> - </filter> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${logDir}/debug/debug.%d{yyyy-MM}.log</fileNamePattern> - <maxHistory>${maxHistory}</maxHistory> - </rollingPolicy> - <encoder> - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern> - </encoder> - </appender> - - <appender name="traceAppender" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <level>TRACE</level> - <onMatch>ACCEPT</onMatch> - <onMismatch>DENY</onMismatch> - </filter> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${logDir}/trace/trace.%d{yyyy-MM}.log</fileNamePattern> - <maxHistory>${maxHistory}</maxHistory> - </rollingPolicy> - <encoder> - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern> - </encoder> - </appender> - - <root> - <level value="info"/> - <appender-ref ref="consoleAppender"/> - <appender-ref ref="errorAppender"/> - <appender-ref ref="warnAppender"/> - <appender-ref ref="infoAppender"/> - <appender-ref ref="debugAppender"/> - <appender-ref ref="traceAppender"/> - </root> -</configuration> diff --git a/integration/src/main/resources/portalConfig/msb_register.xml b/integration/src/main/resources/portalConfig/msb_register.xml deleted file mode 100644 index 0f3777de..00000000 --- a/integration/src/main/resources/portalConfig/msb_register.xml +++ /dev/null @@ -1,155 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2016-2017, CMCC Technologies Co., Ltd. - - 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. ---> -<msbRegister> - <msbHost> - <hostIp>http://192.168.233.226</hostIp> - <hostPort>80</hostPort> - <msbApiRootDomain>/openoapi/microservices/v1/services</msbApiRootDomain> - </msbHost> - <registerList> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/framework</url> - <serviceName>framework</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/thirdparty</url> - <serviceName>thirdparty</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/login</url> - <serviceName>login</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/catalog</url> - <serviceName>catalog</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/extsys</url> - <serviceName>extsys</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/performance</url> - <serviceName>performance</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/monitor</url> - <serviceName>monitor</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/lifecyclemgr</url> - <serviceName>lifecyclemgr</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/resmgr</url> - <serviceName>resmgr</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/provincemgr</url> - <serviceName>provincemgr</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/user</url> - <serviceName>user</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/vnfmarket</url> - <serviceName>vnfmarket</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - <registerInfo> - <ip>127.0.0.1</ip> - <port>9150</port> - <url>/openoui/holmes</url> - <serviceName>holmes</serviceName> - <protocol>UI</protocol> - <visualRange>1</visualRange> - <lb_policy>hash</lb_policy> - <ttl>0</ttl> - </registerInfo> - </registerList> -</msbRegister> diff --git a/integration/src/main/webapp/WEB-INF/web.xml b/integration/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 70005f50..00000000 --- a/integration/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2016-2017, China Mobile Co., Ltd. - - 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. ---> -<web-app> - <display-name>OPEN-O Web Application</display-name> - <welcome-file-list> - <welcome-file>login/index.html</welcome-file> - </welcome-file-list> - <listener> - <listener-class>org.openo.portal.system.SystemListener</listener-class> - </listener> -</web-app> |