@riil-frontend/component-topology 9.0.0-a.11 → 9.0.0-a.12

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -29,8 +29,7 @@ import useCiAttrAndMetricData from "./useCiAttrAndMetricData";
 import Configurator from "./components/Configurator";
 import { formatMetric } from "../../../../../../models/attributeFormatter";
 import LinkTopoCard from "./components/LinkTopo/LinkTopoCard";
-import EventsCard from "./EventsCard";
-import { checkMenu, isOpenFlow, queryLastestValue } from "./components/LinkTopo/services"; // url 处理，UICBB 的地址需截取前缀
+import EventsCard from "./EventsCard"; // url 处理，UICBB 的地址需截取前缀
 
 function formatUrl(url) {
   var _window, _window$location;
@@ -692,7 +691,7 @@ export default function ResourceOverview(props) {
     _metricColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(col) {
       var _col2, _col3;
 
-      var codes, endTime, params, _ref5, times, metricList, newMetricList, metricLists;
+      var codes, endTime, params, _ref5, times, metricList, metricLists;
 
       return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) {
@@ -740,16 +739,7 @@ export default function ResourceOverview(props) {
 
             case 11:
               metricList = _context8.sent;
-              _context8.next = 14;
-              return queryMetricList({
-                'name': data.attributes.display_name
-              }, {
-                'id': data.attributes.name
-              });
-
-            case 14:
-              newMetricList = _context8.sent;
-              metricLists = metricList.concat(getNewMetricList(newMetricList));
+              metricLists = metricList.concat(getNewMetricList());
               rlog.debug('metricColChange', metricLists, monitorMetricModels);
               setMetric(col.map(function (item, key) {
                 return {
@@ -775,7 +765,7 @@ export default function ResourceOverview(props) {
                 }, 60000);
               }
 
-            case 20:
+            case 17:
             case "end":
               return _context8.stop();
           }
@@ -785,73 +775,12 @@ export default function ResourceOverview(props) {
     return _metricColChange.apply(this, arguments);
   }
 
-  function queryMetricList(_x9, _x10) {
-    return _queryMetricList.apply(this, arguments);
-  }
-
-  function _queryMetricList() {
-    _queryMetricList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(data, param) {
-      var checkMenus, isOpen, list;
-      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-        while (1) {
-          switch (_context9.prev = _context9.next) {
-            case 0:
-              if (!(ciType !== 'network_link')) {
-                _context9.next = 2;
-                break;
-              }
-
-              return _context9.abrupt("return", []);
-
-            case 2:
-              _context9.next = 4;
-              return checkMenu();
-
-            case 4:
-              checkMenus = _context9.sent;
-
-              if (!(checkMenus[0].passed == 'PASS')) {
-                _context9.next = 14;
-                break;
-              }
-
-              _context9.next = 8;
-              return isOpenFlow(data);
-
-            case 8:
-              isOpen = _context9.sent;
-
-              if (!isOpen) {
-                _context9.next = 14;
-                break;
-              }
-
-              _context9.next = 12;
-              return queryLastestValue(param);
-
-            case 12:
-              list = _context9.sent;
-              return _context9.abrupt("return", list);
-
-            case 14:
-              return _context9.abrupt("return", []);
-
-            case 15:
-            case "end":
-              return _context9.stop();
-          }
-        }
-      }, _callee9);
-    }));
-    return _queryMetricList.apply(this, arguments);
-  }
-
-  var getNewMetricList = function getNewMetricList(data) {
+  var getNewMetricList = function getNewMetricList() {
     return [{
       errorMsg: null,
       mainCiId: "netDelayRatio",
       metricCode: "netDelayRatio",
-      metricValue: data.upNetDelayRatio + ' ms' + '|' + data.downNetDelayRatio + ' ms',
+      metricValue: '0',
       subCiId: '',
       subCiType: null,
       mainCiType: null
@@ -859,7 +788,7 @@ export default function ResourceOverview(props) {
       errorMsg: null,
       mainCiId: "retansRatio",
       metricCode: "retansRatio",
-      metricValue: data.upRetransRatio + ' %' + '|' + data.downRetansRatio + ' %',
+      metricValue: '0',
       subCiId: '',
       subCiType: null,
       mainCiType: null

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
 import { useRequest } from 'ahooks';
-import { queryLinkInterfacesLatestMetrics, queryLinkLatestMetrics, queryLastestValue } from "../services";
+import { queryLinkInterfacesLatestMetrics, queryLinkLatestMetrics, queryRetansRatioNetDelayRatio } from "../services";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog'; // 资源节点上方色块展示资源的发送速率发送带宽利用率、接收速率发送接收利用率、总错包数
 
 export default function useMetricPolling(_ref) {
@@ -9,10 +9,10 @@ export default function useMetricPolling(_ref) {
       linkMetricCodes = _ref.linkMetricCodes;
   var linkId = linkCi.id;
   var arr = ['netDelayRatio', 'retansRatio'];
-  var oldCodes = [];
-  var newCodes = [];
+  var codes = [];
+  var retansRatioNetDelayRatioCodes = [];
   linkMetricCodes.map(function (item) {
-    arr.indexOf(item) > -1 ? newCodes.push(item) : oldCodes.push(item);
+    arr.indexOf(item) > -1 ? retansRatioNetDelayRatioCodes.push(item) : codes.push(item);
   });
 
   var _useState = useState({
@@ -26,35 +26,15 @@ export default function useMetricPolling(_ref) {
       data = _useState[0],
       setData = _useState[1];
 
-  var queryLastestValues = useRequest(queryLastestValue, {
+  var queryLastestValues = useRequest(queryRetansRatioNetDelayRatio, {
     pollingInterval: 1000 * 15,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
-      var datas = {
-        linkOther: []
-      };
-
-      if (newCodes.includes('netDelayRatio')) {
-        datas.linkOther.push({
-          'code': 'netDelayRatio',
-          'name': '下行RTT时延',
-          'ts': result.time,
-          'value': result.upNetDelayRatio + ' ms' + '|' + result.downNetDelayRatio + ' ms'
-        });
-      }
-
-      if (newCodes.includes('retansRatio')) {
-        datas.linkOther.push({
-          'code': 'retansRatio',
-          'name': '重传率',
-          'ts': result.time,
-          'value': result.upRetransRatio + ' %' + '|' + result.downRetansRatio + ' %'
-        });
-      }
-
-      setData(_extends({}, data, datas));
+      setData(_extends({}, data, {
+        linkOther: result
+      }));
     }
   }); // 轮询hooks
 
@@ -78,26 +58,36 @@ export default function useMetricPolling(_ref) {
       rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 结果', result);
     }
   });
-  var linkMetricCodesStr = oldCodes.map(function (item) {
+  var linkMetricCodesStr = codes.map(function (item) {
     return item;
   }).sort().join(',');
   useEffect(function () {
     if (linkId) {
       rlog.info('链路拓扑指标轮询 切换', {
         linkCi: linkCi,
-        oldCodes: oldCodes
+        codes: codes
       });
-      queryLinkMetricsRequest.run(linkCi, oldCodes);
-
-      if (newCodes.length > 0) {
-        queryLastestValues.run({
-          'id': linkCi.attributes.name
-        });
-      }
+      queryLinkMetricsRequest.run(linkCi, codes);
     }
 
     return function () {};
   }, [linkId, linkMetricCodesStr]);
+  var retansRatioNetDelayRatioCodesStr = retansRatioNetDelayRatioCodes.map(function (item) {
+    return item;
+  }).sort().join(',');
+  useEffect(function () {
+    if (linkId) {
+      rlog.info('链路拓扑指标勾选rtt|重传率 轮询', {
+        linkCi: linkCi,
+        retansRatioNetDelayRatioCodes: retansRatioNetDelayRatioCodes
+      });
+      queryLastestValues.run({
+        'id': linkCi.attributes.name
+      }, retansRatioNetDelayRatioCodes);
+    }
+
+    return function () {};
+  }, [linkId, retansRatioNetDelayRatioCodesStr]);
   useEffect(function () {
     if (linkId) {
       rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js

@@ -245,7 +245,7 @@ export function isOpenFlow(_x6) {
   return _isOpenFlow.apply(this, arguments);
 }
 /**
- * @name  isOpenFlow 查指标值
+ * @name  queryLastestValue 查指标值
  * @returns  
  */
 
@@ -287,4 +287,60 @@ function _queryLastestValue() {
     }, _callee7);
   }));
   return _queryLastestValue.apply(this, arguments);
+}
+
+export function queryRetansRatioNetDelayRatio(_x8, _x9) {
+  return _queryRetansRatioNetDelayRatio.apply(this, arguments);
+}
+
+function _queryRetansRatioNetDelayRatio() {
+  _queryRetansRatioNetDelayRatio = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(params, retansRatioNetDelayRatioCodes) {
+    var result, linkOther;
+    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      while (1) {
+        switch (_context8.prev = _context8.next) {
+          case 0:
+            if (retansRatioNetDelayRatioCodes.length) {
+              _context8.next = 2;
+              break;
+            }
+
+            return _context8.abrupt("return", []);
+
+          case 2:
+            _context8.next = 4;
+            return queryLastestValue(params);
+
+          case 4:
+            result = _context8.sent;
+            linkOther = [];
+
+            if (retansRatioNetDelayRatioCodes.includes('netDelayRatio')) {
+              linkOther.push({
+                'code': 'netDelayRatio',
+                'name': '下行RTT时延',
+                'ts': result.time,
+                'value': (result.upNetDelayRatio * 1).toFixed() + ' ms' + '|' + (result.downNetDelayRatio * 1).toFixed() + ' ms'
+              });
+            }
+
+            if (retansRatioNetDelayRatioCodes.includes('retansRatio')) {
+              linkOther.push({
+                'code': 'retansRatio',
+                'name': '重传率',
+                'ts': result.time,
+                'value': (result.upRetransRatio * 1).toFixed() + ' %' + '|' + (result.downRetansRatio * 1).toFixed() + ' %'
+              });
+            }
+
+            return _context8.abrupt("return", linkOther);
+
+          case 9:
+          case "end":
+            return _context8.stop();
+        }
+      }
+    }, _callee8);
+  }));
+  return _queryRetansRatioNetDelayRatio.apply(this, arguments);
 }

package/es/networkTopo/services/link.js

@@ -1,6 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { request } from '@riil-frontend/component-topology-utils';
+import { request } from "@riil-frontend/component-topology-utils";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 export default {
   /**

package/es/networkTopo/services/topo/basic.js

@@ -9,6 +9,7 @@ import blackList from "./blacklist";
 import { TOPO_API_ROOT } from "./constants";
 import { commonQuery } from "../cmdb";
 import { getBatchCi as _getBatchCi, getBatchCiMetric as _getBatchCiMetric } from "../model";
+import { processExitLink } from "../../utils/exitLinkUtil";
 var API_ROOT = TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -413,13 +414,13 @@ export default _extends({
 
             case 3:
               result = _context12.sent;
-              return _context12.abrupt("return", _extends({}, result, {
+              return _context12.abrupt("return", processExitLink(_extends({}, result, {
                 links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
                   return _extends({}, item, {
                     ciType: 'network_link'
                   });
                 })
-              }));
+              })));
 
             case 7:
               _context12.prev = 7;
@@ -443,7 +444,7 @@ export default _extends({
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList, ipNodes) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
       var _result$links2;
 

package/es/networkTopo/services/topo/networkLink.js

@@ -6,9 +6,9 @@ var API_ROOT = TOPO_API_ROOT;
 export default {
   /**
    * 批量查询ci类型是否可创建链路
-   * 
-   * @param {*} typeCodes 
-   * @returns 
+   *
+   * @param {*} typeCodes
+   * @returns
    */
   getCiTypesConnectable: function getCiTypesConnectable(typeCodes) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -29,5 +29,47 @@ export default {
         }
       }, _callee);
     }))();
+  },
+
+  /**
+   * 通过ip查询关联链路
+   *
+   * @param {array} ciIds
+   */
+  queryLinksByIp: function queryLinksByIp(ids, ip) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var stag, condition, parm, result;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              stag = "'" + ids.join("','") + "'";
+              condition = "type('network_link') && network_link.destination_ipv4 = '" + ip + "' && network_link.source_device_id in [" + stag + "]";
+              parm = {
+                condition: condition,
+                sort: "name asc",
+                currentPage: 1,
+                pageSize: 999
+              };
+              _context2.prev = 3;
+              _context2.next = 6;
+              return request.post("/mdc/v1/api/cmdb/commonQueryCiData", parm);
+
+            case 6:
+              result = _context2.sent;
+              return _context2.abrupt("return", result);
+
+            case 10:
+              _context2.prev = 10;
+              _context2.t0 = _context2["catch"](3);
+              rlog.error("通过ip查询关联链路", _context2.t0);
+
+            case 13:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, null, [[3, 10]]);
+    }))();
   }
 };

package/es/networkTopo/utils/exitLinkUtil.js

@@ -0,0 +1,110 @@
+import _extends from "@babel/runtime/helpers/extends";
+
+function findPingNode(nodes, ip) {
+  return nodes.find(function (node) {
+    return node.ciType === 'ping' && node.ipAddress === ip;
+  });
+}
+
+function buildIpNode(ip) {
+  return {
+    'id': "ip_" + ip,
+    'name': ip,
+    bindType: 'ip',
+    // 绑定资源类型。关联资源 值为空，关联IP ip
+    // TODO 所属区域，从序列化拿
+    // 'groupId': null,
+    // 'groupTag': null,
+    'ipAddress': '1.1.1.1',
+    // 'attributes': [],
+    // 'metrics': [],
+    'type': 'node',
+    // 'dtype': 'device'
+    'operation': 'delete'
+  };
+}
+
+function getHtSerialize(serialize) {
+  if (serialize) {
+    return JSON.parse(serialize);
+  }
+
+  return null;
+}
+
+function isExitLink(link) {
+  return link.attributes.destination_type === 'ip';
+}
+
+export function processExitLink(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+
+  var serialize = _extends({}, getHtSerialize(topoData.serialize)); // 出口链路目的端为IP节点时（非ping资源），IP构造为node节点
+
+
+  var ipNodes = [];
+  var newLinks = links.map(function (link) {
+    // 非出口链路不处理
+    if (!isExitLink(link)) {
+      return link;
+    } // 如果链路目的端在资源节点列表存在，则不处理
+
+
+    if (link.target && nodes.find(function (node) {
+      return node.id === link.target;
+    })) {
+      return link;
+    } // IP节点构造为node，链路作为标准链路处理
+
+
+    var destinationIp = link.attributes['network_link.destination_ipv4'];
+    var pingNode = findPingNode(nodes, destinationIp); // 目的端为非ping资源的IP节点时，构造为node
+
+    if (!pingNode && !ipNodes.find(function (item) {
+      return item.id === "ip_" + destinationIp;
+    })) {
+      var targetIpNode = buildIpNode(destinationIp);
+      ipNodes.push(targetIpNode);
+    } // 出口链路目的端为 ping资源 时，设置target为ping资源id
+    // 出口链路目的端为 IP节点 时，设置target为ip
+
+
+    var target = pingNode ? pingNode.id : "ip_" + destinationIp; // 序列化升级
+
+    if (!pingNode && serialize) {
+      // 1. 链路在序列化存在且目的端不是IP节点时，序列化升级
+      // 判断目的端节点是否是IP节点
+      var isIpNode = serialize.d.find(function (item) {
+        return item.p.tag === "ip_" + destinationIp;
+      }); // 序列化数据升级图片节点。
+
+      var linkSerialize = serialize.d.find(function (item) {
+        return item.a.id === link.id;
+      });
+
+      if (!isIpNode && linkSerialize) {
+        // 根据链路序列化数据找目的端节点
+        // eslint-disable-next-line no-underscore-dangle
+        var nodeSerialize = serialize.d.find(function (item) {
+          return item.i === linkSerialize.p.target.__i;
+        });
+        nodeSerialize.a = _extends({}, nodeSerialize.a, buildIpNode(destinationIp), {
+          isbinding: true
+        });
+        nodeSerialize.p.tag = "ip_" + destinationIp;
+      } // 如果有相同ip的ping资源和图片节点，图片节点消失（从序列化数据删除IP节点）
+      // TODO
+
+    }
+
+    return _extends({}, link, {
+      target: target
+    });
+  });
+  return _extends({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks,
+    serialize: serialize
+  });
+}