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

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

@@ -10,6 +10,7 @@ exports.queryLastestValue = queryLastestValue;
 exports.queryLatestMetrics = queryLatestMetrics;
 exports.queryLinkInterfacesLatestMetrics = queryLinkInterfacesLatestMetrics;
 exports.queryLinkLatestMetrics = queryLinkLatestMetrics;
+exports.queryRetansRatioNetDelayRatio = queryRetansRatioNetDelayRatio;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -276,7 +277,7 @@ function isOpenFlow(_x6) {
   return _isOpenFlow.apply(this, arguments);
 }
 /**
- * @name  isOpenFlow 查指标值
+ * @name  queryLastestValue 查指标值
  * @returns  
  */
 
@@ -319,4 +320,60 @@ function _queryLastestValue() {
     }, _callee7);
   }));
   return _queryLastestValue.apply(this, arguments);
+}
+
+function queryRetansRatioNetDelayRatio(_x8, _x9) {
+  return _queryRetansRatioNetDelayRatio.apply(this, arguments);
+}
+
+function _queryRetansRatioNetDelayRatio() {
+  _queryRetansRatioNetDelayRatio = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(params, retansRatioNetDelayRatioCodes) {
+    var result, linkOther;
+    return _regenerator["default"].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/lib/networkTopo/services/topo/basic.js

@@ -25,6 +25,8 @@ var _cmdb = require("../cmdb");
 
 var _model = require("../model");
 
+var _exitLinkUtil = require("../../utils/exitLinkUtil");
+
 var _excluded = ["groups", "resources"];
 var API_ROOT = _constants.TOPO_API_ROOT;
 /**
@@ -432,13 +434,13 @@ var _default = (0, _extends2["default"])({
 
             case 3:
               result = _context12.sent;
-              return _context12.abrupt("return", (0, _extends2["default"])({}, result, {
+              return _context12.abrupt("return", (0, _exitLinkUtil.processExitLink)((0, _extends2["default"])({}, result, {
                 links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
                   return (0, _extends2["default"])({}, item, {
                     ciType: 'network_link'
                   });
                 })
-              }));
+              })));
 
             case 7:
               _context12.prev = 7;
@@ -464,7 +466,7 @@ var _default = (0, _extends2["default"])({
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList, ipNodes) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
       var _result$links2;
 

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

@@ -17,9 +17,9 @@ var API_ROOT = _constants.TOPO_API_ROOT;
 var _default = {
   /**
    * 批量查询ci类型是否可创建链路
-   * 
-   * @param {*} typeCodes 
-   * @returns 
+   *
+   * @param {*} typeCodes
+   * @returns
    */
   getCiTypesConnectable: function getCiTypesConnectable(typeCodes) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -40,6 +40,48 @@ var _default = {
         }
       }, _callee);
     }))();
+  },
+
+  /**
+   * 通过ip查询关联链路
+   *
+   * @param {array} ciIds
+   */
+  queryLinksByIp: function queryLinksByIp(ids, ip) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var stag, condition, parm, result;
+      return _regenerator["default"].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 _componentTopologyUtils.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]]);
+    }))();
   }
 };
 exports["default"] = _default;

package/lib/networkTopo/utils/exitLinkUtil.js

@@ -0,0 +1,115 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.processExitLink = processExitLink;
+
+var _extends2 = _interopRequireDefault(require("@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';
+}
+
+function processExitLink(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var serialize = (0, _extends2["default"])({}, 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 = (0, _extends2["default"])({}, nodeSerialize.a, buildIpNode(destinationIp), {
+          isbinding: true
+        });
+        nodeSerialize.p.tag = "ip_" + destinationIp;
+      } // 如果有相同ip的ping资源和图片节点，图片节点消失（从序列化数据删除IP节点）
+      // TODO
+
+    }
+
+    return (0, _extends2["default"])({}, link, {
+      target: target
+    });
+  });
+  return (0, _extends2["default"])({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks,
+    serialize: serialize
+  });
+}

package/lib/utils/htElementUtils.js

@@ -32,6 +32,7 @@ exports.isGroup = isGroup;
 exports.isLayer = isLayer;
 exports.isNode = isNode;
 exports.isText = isText;
+exports.isUniqueIp = isUniqueIp;
 exports.isValidEdge = isValidEdge;
 exports.setElementRuntimeStyle = setElementRuntimeStyle;
 
@@ -55,7 +56,7 @@ function getElementData(element) {
     styleMap: element.getStyleMap()
   };
 
-  if (className === 'ht.Edge') {
+  if (className === "ht.Edge") {
     return (0, _extends3["default"])({}, commonData);
   }
 
@@ -67,7 +68,7 @@ function getElementData(element) {
 function isNode(element) {
   // HT为了支持区域内无节点可展开增加了站位节点，因此 节点的layer等于container_blank的过滤掉就可以了
   // eslint-disable-next-line no-underscore-dangle
-  return element instanceof ht.Node && !isLayer(element) && element._layer !== 'container_blank';
+  return element instanceof ht.Node && !isLayer(element) && element._layer !== "container_blank";
 }
 
 function isEdge(element) {
@@ -80,7 +81,7 @@ function isValidEdge(element) {
   }
 
   if (!element.getSource() || !element.getTarget()) {
-    _rlog["default"].error('isValidEdge 连线异常：源或目的为空', element);
+    _rlog["default"].error("isValidEdge 连线异常：源或目的为空", element);
 
     return false;
   }
@@ -97,7 +98,30 @@ function isLayer(element) {
 }
 
 function isText(element) {
-  return element instanceof ht.Text && element.a('isText');
+  return element instanceof ht.Text && element.a("isText");
+}
+
+function isUniqueIp(dataModel, ip) {
+  console.log("isUniqueIp", ip);
+  var nodes = getNodes(dataModel);
+  var isUnique = true;
+
+  for (var i = 0; i < nodes.length; i++) {
+    var element = nodes[i];
+    var tagTxt = element.getTag();
+    console.log("isUniqueIp-element", tagTxt, ip);
+
+    if (tagTxt !== null && tagTxt !== void 0 && tagTxt.startsWith("ip_")) {
+      var ipTxt = tagTxt.replace("ip_", '');
+
+      if (ipTxt === ip) {
+        isUnique = false;
+        break;
+      }
+    }
+  }
+
+  return isUnique;
 }
 
 function getElements(dataModel) {
@@ -123,7 +147,7 @@ function getGroupDatas(dataModel) {
 
 function getGroupElementByTag(dataModel, tag) {
   return dataModel.getDataByTag(tag) || dataModel.getDatas().toArray().filter(function (item) {
-    return item.a('tag') === tag;
+    return item.a("tag") === tag;
   })[0];
 }
 
@@ -135,14 +159,14 @@ function getGroupData(element) {
   var parent = element.getParent();
   var groupInfo = parent ? {
     groupId: parent.getTag(),
-    groupTag: parent.a('tag') // 父容器
+    groupTag: parent.a("tag") // 父容器
 
   } : {};
   return (0, _extends3["default"])({
     name: element.getStyleMap().label
   }, element.getAttrObject(), {
     id: element.getTag(),
-    tag: element.a('tag'),
+    tag: element.a("tag"),
     image: element.getImage()
   }, groupInfo);
 }
@@ -159,7 +183,7 @@ function getNodeData(element) {
   var parent = element.getParent();
   var groupInfo = parent ? {
     groupId: parent.getTag(),
-    groupTag: parent.a('tag') // 父容器
+    groupTag: parent.a("tag") // 父容器
 
   } : {};
   return (0, _extends3["default"])({}, element.getAttrObject(), {
@@ -173,12 +197,12 @@ function getEdges(dataModel) {
 }
 
 function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s('edge.expanded');
+  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
 }
 /**
  * 是否连线组代理
- * @param {*} edge 
- * @returns 
+ * @param {*} edge
+ * @returns
  */
 
 
@@ -187,9 +211,9 @@ function isEdgeGroupAgent(edge) {
 }
 /**
  * 获得两个节点间的连线列表
- * @param {*} node1 
- * @param {*} node2 
- * @returns 
+ * @param {*} node1
+ * @param {*} node2
+ * @returns
  */
 
 
@@ -212,7 +236,7 @@ function getEdgesBetweenNodes(node1, node2) {
 }
 /**
  * 获得节点间的连线组，连线<=1时返回null
- * @returns 
+ * @returns
  */
 
 
@@ -232,7 +256,7 @@ function getEdgeGroupByNodes(node1, node2) {
 }
 /**
  * 获得节点间的连线组，连线<=1时返回null
- * @returns 
+ * @returns
  */
 
 
@@ -241,7 +265,7 @@ function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
   var node2 = dataModel.getDataByTag(nodeTag2);
 
   if (!node1 || !node2) {
-    console.warn('getEdgeGroupByNodes 未找到节点', {
+    console.warn("getEdgeGroupByNodes 未找到节点", {
       node1: node1,
       node2: node2,
       nodeTag1: nodeTag1,
@@ -328,7 +352,7 @@ function getGroupChildren(group) {
 
 
   return group.getChildren().getArray().filter(function (node) {
-    return node._layer !== 'container_blank';
+    return node._layer !== "container_blank";
   });
 }
 /**
@@ -361,7 +385,7 @@ function getGroupChildrenData(group) {
 function setElementRuntimeStyle(element, name, value) {
   var _extends2;
 
-  var prevRuntimeStyle = element.a('runtimeStyles') || {};
+  var prevRuntimeStyle = element.a("runtimeStyles") || {};
   var runtimeStyle = (0, _extends3["default"])({}, prevRuntimeStyle, (_extends2 = {}, _extends2[name] = value, _extends2)); // if (prevRuntimeStyle[name] === undefined && value === undefined) {
   //   return
   // }
@@ -370,7 +394,7 @@ function setElementRuntimeStyle(element, name, value) {
     runtimeStyle[name] = undefined; // delete runtimeStyle[name]
   }
 
-  element.a('runtimeStyles', runtimeStyle);
+  element.a("runtimeStyles", runtimeStyle);
 }
 /**
  * 判断拓扑图是否存在元素
@@ -384,7 +408,7 @@ function isExistedElement(htTopo, dataModel, data) {
 
 
   var element = getElements(dataModel).find(function (item) {
-    return data.tag && item.a('tag') === data.tag;
+    return data.tag && item.a("tag") === data.tag;
   });
 
   if (element) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "9.0.0-a.10",
+  "version": "9.0.0-a.12",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.10/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.12/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }