From c60278ca93270bb9f49c65339dbe34c039551fe0 Mon Sep 17 00:00:00 2001 From: “shentao” Date: Thu, 27 Oct 2016 15:02:54 +0800 Subject: issue-id GSO-64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0c6433c630c3afac827140df7bcafa643f94b90d Signed-off-by: “shentao” --- openo-portal/portal-package/pom.xml | 27 ++++ .../org/openo/portal/bean/MsbRegisterBean.java | 80 ++++++++++++ .../org/openo/portal/bean/ServiceNodeBean.java | 48 +++++++ .../java/org/openo/portal/system/CommonUtil.java | 27 ++++ .../java/org/openo/portal/system/Constants.java | 20 +++ .../org/openo/portal/system/RegisterService.java | 142 +++++++++++++++++++++ .../org/openo/portal/system/SystemListener.java | 36 ++++++ .../main/resources/portalConfig/msb_register.xml | 105 +++++++++++++++ .../portal-package/src/main/webapp/WEB-INF/web.xml | 11 +- .../src/main/webapp/performance/alarm_view.html | 15 +++ .../main/webapp/performance/css/alarmsQuery.css | 15 +++ .../webapp/performance/css/performanceChart.css | 15 +++ .../webapp/performance/css/performanceQuery.css | 15 +++ .../src/main/webapp/performance/css/pmQueryBox.css | 19 ++- .../i18n/web-alarm-i18n-en-US.properties | 15 +++ .../i18n/web-performance-i18n-en-US.properties | 17 ++- .../src/main/webapp/performance/js/alarmConds.js | 15 +++ .../webapp/performance/js/alarmsServerPageTable.js | 15 +++ .../src/main/webapp/performance/js/alarmsUtil.js | 15 +++ .../src/main/webapp/performance/js/commonUtil.js | 15 +++ .../webapp/performance/js/curAlarmsController.js | 15 +++ .../main/webapp/performance/js/performanceChart.js | 15 +++ .../performance/js/performanceQueryController.js | 15 +++ .../src/main/webapp/performance/js/pmUtil.js | 17 ++- .../main/webapp/performance/js/serverPageTable.js | 15 +++ .../webapp/performance/performance_query_rule.html | 17 ++- .../main/webapp/performance/performance_view.html | 17 ++- 27 files changed, 766 insertions(+), 12 deletions(-) create mode 100644 openo-portal/portal-package/src/main/java/org/openo/portal/bean/MsbRegisterBean.java create mode 100644 openo-portal/portal-package/src/main/java/org/openo/portal/bean/ServiceNodeBean.java create mode 100644 openo-portal/portal-package/src/main/java/org/openo/portal/system/CommonUtil.java create mode 100644 openo-portal/portal-package/src/main/java/org/openo/portal/system/Constants.java create mode 100644 openo-portal/portal-package/src/main/java/org/openo/portal/system/RegisterService.java create mode 100644 openo-portal/portal-package/src/main/java/org/openo/portal/system/SystemListener.java create mode 100644 openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml index c11927cc..5f9896ec 100644 --- a/openo-portal/portal-package/pom.xml +++ b/openo-portal/portal-package/pom.xml @@ -31,6 +31,12 @@ + + javax.servlet + servlet-api + provided + 2.5 + org.openo.gso.gui portal-common @@ -73,6 +79,27 @@ 1.1.0-SNAPSHOT war + + dom4j + dom4j + 1.6.1 + + + net.sf.json-lib + json-lib + 2.1 + jdk15 + + + commons-httpclient + commons-httpclient + 3.1 + + + org.apache.httpcomponents + httpclient + 4.3.5 + diff --git a/openo-portal/portal-package/src/main/java/org/openo/portal/bean/MsbRegisterBean.java b/openo-portal/portal-package/src/main/java/org/openo/portal/bean/MsbRegisterBean.java new file mode 100644 index 00000000..c5b53d03 --- /dev/null +++ b/openo-portal/portal-package/src/main/java/org/openo/portal/bean/MsbRegisterBean.java @@ -0,0 +1,80 @@ +/* + * Copyright 2016, 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 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 getNodes() { + return nodes; + } + + public void setNodes(List nodes) { + this.nodes = nodes; + } +} diff --git a/openo-portal/portal-package/src/main/java/org/openo/portal/bean/ServiceNodeBean.java b/openo-portal/portal-package/src/main/java/org/openo/portal/bean/ServiceNodeBean.java new file mode 100644 index 00000000..0c20ac63 --- /dev/null +++ b/openo-portal/portal-package/src/main/java/org/openo/portal/bean/ServiceNodeBean.java @@ -0,0 +1,48 @@ +/* + * Copyright 2016, 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/openo-portal/portal-package/src/main/java/org/openo/portal/system/CommonUtil.java b/openo-portal/portal-package/src/main/java/org/openo/portal/system/CommonUtil.java new file mode 100644 index 00000000..b28bb1ef --- /dev/null +++ b/openo-portal/portal-package/src/main/java/org/openo/portal/system/CommonUtil.java @@ -0,0 +1,27 @@ +/* + * Copyright 2016, 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/openo-portal/portal-package/src/main/java/org/openo/portal/system/Constants.java b/openo-portal/portal-package/src/main/java/org/openo/portal/system/Constants.java new file mode 100644 index 00000000..b27c73e6 --- /dev/null +++ b/openo-portal/portal-package/src/main/java/org/openo/portal/system/Constants.java @@ -0,0 +1,20 @@ +/* + * Copyright 2016, 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/openo-portal/portal-package/src/main/java/org/openo/portal/system/RegisterService.java b/openo-portal/portal-package/src/main/java/org/openo/portal/system/RegisterService.java new file mode 100644 index 00000000..01ba3526 --- /dev/null +++ b/openo-portal/portal-package/src/main/java/org/openo/portal/system/RegisterService.java @@ -0,0 +1,142 @@ +/* + * Copyright 2016, 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; + +public class RegisterService { + + public static HashMap msbHostMap = new HashMap(); + public static List> registerList = new ArrayList>(); + + 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 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 nodeList = new ArrayList(); + 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(url, registerObj, ""); + // TODO + System.out.println(registerResponse); + } + } catch (Exception e){ + // TODO + e.printStackTrace(); + } + } + + 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 registerMap = new HashMap(); + 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 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; + } + } + } catch (Exception e) { + // TODO + e.printStackTrace();; + } + + return response; + } +} diff --git a/openo-portal/portal-package/src/main/java/org/openo/portal/system/SystemListener.java b/openo-portal/portal-package/src/main/java/org/openo/portal/system/SystemListener.java new file mode 100644 index 00000000..05447232 --- /dev/null +++ b/openo-portal/portal-package/src/main/java/org/openo/portal/system/SystemListener.java @@ -0,0 +1,36 @@ +/* + * Copyright 2016, 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; + +public class SystemListener implements ServletContextListener { + + public void contextDestroyed(ServletContextEvent sce) { + } + + public void contextInitialized(ServletContextEvent servletContextEvent) { + // TODO + System.out.println("portal register task begin"); + String registerFilePath = SystemListener.class.getClassLoader().getResource("").getPath() + "portalConfig" + File.separator + "msb_register.xml"; + RegisterService.registerMsb(registerFilePath); + // TODO + System.out.println("portal register task ended."); + } +} diff --git a/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml b/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml new file mode 100644 index 00000000..b0a94acd --- /dev/null +++ b/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml @@ -0,0 +1,105 @@ + + + + + http://192.168.233.226 + 80 + /openoapi/microservices/v1/services + + + + 127.0.0.1 + 8300 + /openo-portal/common + common + UI + 1 + hash + 0 + + + 127.0.0.1 + 8300 + /openo-portal/catalog + catalog + UI + 1 + hash + 0 + + + 127.0.0.1 + 8300 + /openo-portal/extsys + extsys + UI + 1 + hash + 0 + + + 127.0.0.1 + 8300 + /openo-portal/performance + performance + UI + 1 + hash + 0 + + + 127.0.0.1 + 8300 + /openo-portal/lifecyclemgr + lifecyclemgr + UI + 1 + hash + 0 + + + 127.0.0.1 + 8300 + /openo-portal/resmgr-nfv + resmgr-nfv + UI + 1 + hash + 0 + + + 127.0.0.1 + 8300 + /openo-portal/resmgr-sdn + resmgr-sdn + UI + 1 + hash + 0 + + + 127.0.0.1 + 8300 + /openo-portal/user + user + UI + 1 + hash + 0 + + + diff --git a/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml b/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml index 071ba46b..70a71954 100644 --- a/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml +++ b/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml @@ -15,8 +15,11 @@ limitations under the License. --> - OPEN-O Web Application - - common/login.html - + OPEN-O Web Application + + common/login.html + + + org.openo.portal.system.SystemListener + diff --git a/openo-portal/portal-performance/src/main/webapp/performance/alarm_view.html b/openo-portal/portal-performance/src/main/webapp/performance/alarm_view.html index a210d658..2e883ee6 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/alarm_view.html +++ b/openo-portal/portal-performance/src/main/webapp/performance/alarm_view.html @@ -1,3 +1,18 @@ + diff --git a/openo-portal/portal-performance/src/main/webapp/performance/css/alarmsQuery.css b/openo-portal/portal-performance/src/main/webapp/performance/css/alarmsQuery.css index 1ad72971..ee837212 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/css/alarmsQuery.css +++ b/openo-portal/portal-performance/src/main/webapp/performance/css/alarmsQuery.css @@ -1,3 +1,18 @@ +/** + * Copyright 2016, 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. + */ body { overflow: auto !important; background-color: #fff; diff --git a/openo-portal/portal-performance/src/main/webapp/performance/css/performanceChart.css b/openo-portal/portal-performance/src/main/webapp/performance/css/performanceChart.css index 85da87d6..a6556291 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/css/performanceChart.css +++ b/openo-portal/portal-performance/src/main/webapp/performance/css/performanceChart.css @@ -1,3 +1,18 @@ +/** + * Copyright 2016, 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. + */ .reveal-modal-bg { position: fixed; height: 100%; diff --git a/openo-portal/portal-performance/src/main/webapp/performance/css/performanceQuery.css b/openo-portal/portal-performance/src/main/webapp/performance/css/performanceQuery.css index f747a57d..6594e948 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/css/performanceQuery.css +++ b/openo-portal/portal-performance/src/main/webapp/performance/css/performanceQuery.css @@ -1,3 +1,18 @@ +/** + * Copyright 2016, 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. + */ body{ font-family: microsoft yahei !important; } diff --git a/openo-portal/portal-performance/src/main/webapp/performance/css/pmQueryBox.css b/openo-portal/portal-performance/src/main/webapp/performance/css/pmQueryBox.css index aa930c6e..06428ed7 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/css/pmQueryBox.css +++ b/openo-portal/portal-performance/src/main/webapp/performance/css/pmQueryBox.css @@ -1,7 +1,18 @@ -/*.row a { - font-size: 14px; -}*/ - +/** + * Copyright 2016, 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. + */ #addRule { margin-bottom: 10px; } diff --git a/openo-portal/portal-performance/src/main/webapp/performance/i18n/web-alarm-i18n-en-US.properties b/openo-portal/portal-performance/src/main/webapp/performance/i18n/web-alarm-i18n-en-US.properties index 975589d4..281d3e35 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/i18n/web-alarm-i18n-en-US.properties +++ b/openo-portal/portal-performance/src/main/webapp/performance/i18n/web-alarm-i18n-en-US.properties @@ -1,3 +1,18 @@ +# +# Copyright 2016, 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. +# //表格相关 ngict-fm-iui-table-sLengthMenu=View _MENU_ records ngict-fm-iui-table-sZeroRecords=No matching records found diff --git a/openo-portal/portal-performance/src/main/webapp/performance/i18n/web-performance-i18n-en-US.properties b/openo-portal/portal-performance/src/main/webapp/performance/i18n/web-performance-i18n-en-US.properties index 6b257704..02fa546b 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/i18n/web-performance-i18n-en-US.properties +++ b/openo-portal/portal-performance/src/main/webapp/performance/i18n/web-performance-i18n-en-US.properties @@ -1,4 +1,19 @@ -com_zte_ums_ict_pm_index_indexManagement=Index Management +# +# Copyright 2016, 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. +# +com_zte_ums_ict_pm_index_indexManagement=Index Management com_zte_ums_ict_pm_index_indexName=Name com_zte_ums_ict_pm_index_dataType=Data Type com_zte_ums_ict_pm_index_moType=Mo Type diff --git a/openo-portal/portal-performance/src/main/webapp/performance/js/alarmConds.js b/openo-portal/portal-performance/src/main/webapp/performance/js/alarmConds.js index ffda35af..69f72d77 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/js/alarmConds.js +++ b/openo-portal/portal-performance/src/main/webapp/performance/js/alarmConds.js @@ -1,3 +1,18 @@ +/* + * Copyright 2016, 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. + */ var AlarmConds = function () { return { diff --git a/openo-portal/portal-performance/src/main/webapp/performance/js/alarmsServerPageTable.js b/openo-portal/portal-performance/src/main/webapp/performance/js/alarmsServerPageTable.js index d6ea7b88..67659204 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/js/alarmsServerPageTable.js +++ b/openo-portal/portal-performance/src/main/webapp/performance/js/alarmsServerPageTable.js @@ -1,3 +1,18 @@ +/* + * Copyright 2016, 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. + */ var serverPageTable = {}; var queryCacheId = null; var alarmCount; diff --git a/openo-portal/portal-performance/src/main/webapp/performance/js/alarmsUtil.js b/openo-portal/portal-performance/src/main/webapp/performance/js/alarmsUtil.js index 8ef58b8c..b0633cf2 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/js/alarmsUtil.js +++ b/openo-portal/portal-performance/src/main/webapp/performance/js/alarmsUtil.js @@ -1,3 +1,18 @@ +/* + * Copyright 2016, 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. + */ var alarmsUtil = {}; var alarmTemp=[]; diff --git a/openo-portal/portal-performance/src/main/webapp/performance/js/commonUtil.js b/openo-portal/portal-performance/src/main/webapp/performance/js/commonUtil.js index be44cc7b..8ab957e5 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/js/commonUtil.js +++ b/openo-portal/portal-performance/src/main/webapp/performance/js/commonUtil.js @@ -1,3 +1,18 @@ +/* + * Copyright 2016, 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. + */ var commonUtil = {}; commonUtil.sendSynRequest = function(url){ diff --git a/openo-portal/portal-performance/src/main/webapp/performance/js/curAlarmsController.js b/openo-portal/portal-performance/src/main/webapp/performance/js/curAlarmsController.js index 1228d876..9711e760 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/js/curAlarmsController.js +++ b/openo-portal/portal-performance/src/main/webapp/performance/js/curAlarmsController.js @@ -1,3 +1,18 @@ +/* + * Copyright 2016, 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. + */ var refreshByCond; var lang = 'en-US'; diff --git a/openo-portal/portal-performance/src/main/webapp/performance/js/performanceChart.js b/openo-portal/portal-performance/src/main/webapp/performance/js/performanceChart.js index 01aff1e1..97840425 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/js/performanceChart.js +++ b/openo-portal/portal-performance/src/main/webapp/performance/js/performanceChart.js @@ -1,3 +1,18 @@ +/* + * Copyright 2016, 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. + */ // draw the chart by performance datas function drawPerformanceChart() { var chartType = ""; diff --git a/openo-portal/portal-performance/src/main/webapp/performance/js/performanceQueryController.js b/openo-portal/portal-performance/src/main/webapp/performance/js/performanceQueryController.js index 9fd8489f..d0d6b2eb 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/js/performanceQueryController.js +++ b/openo-portal/portal-performance/src/main/webapp/performance/js/performanceQueryController.js @@ -1,3 +1,18 @@ +/* + * Copyright 2016, 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. + */ var pm = {}; pm.query = {}; pm.query.vmPmQuery = avalon.define({ diff --git a/openo-portal/portal-performance/src/main/webapp/performance/js/pmUtil.js b/openo-portal/portal-performance/src/main/webapp/performance/js/pmUtil.js index 4d1129c8..2e993fe2 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/js/pmUtil.js +++ b/openo-portal/portal-performance/src/main/webapp/performance/js/pmUtil.js @@ -1,4 +1,19 @@ -var pmUtil = {}; +/* + * Copyright 2016, 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. + */ +var pmUtil = {}; function html_encode(str) { vars = ""; if (str.length == 0)return ""; diff --git a/openo-portal/portal-performance/src/main/webapp/performance/js/serverPageTable.js b/openo-portal/portal-performance/src/main/webapp/performance/js/serverPageTable.js index 85113e78..a67c50e8 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/js/serverPageTable.js +++ b/openo-portal/portal-performance/src/main/webapp/performance/js/serverPageTable.js @@ -1,3 +1,18 @@ +/* + * Copyright 2016, 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. + */ var serverPageTable = {}; /* Bootstrap style full number pagination control */ $.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings ) diff --git a/openo-portal/portal-performance/src/main/webapp/performance/performance_query_rule.html b/openo-portal/portal-performance/src/main/webapp/performance/performance_query_rule.html index b72cd5c0..2020c73e 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/performance_query_rule.html +++ b/openo-portal/portal-performance/src/main/webapp/performance/performance_query_rule.html @@ -1,4 +1,19 @@ -
+ +
diff --git a/openo-portal/portal-performance/src/main/webapp/performance/performance_view.html b/openo-portal/portal-performance/src/main/webapp/performance/performance_view.html index a55a5ac4..4b192c25 100644 --- a/openo-portal/portal-performance/src/main/webapp/performance/performance_view.html +++ b/openo-portal/portal-performance/src/main/webapp/performance/performance_view.html @@ -1,4 +1,19 @@ - + + -- cgit 1.2.3-korg