@riil-frontend/component-topology 9.0.0-a.3 → 9.0.0-a.30

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(2) + ' ms' + '|' + (result.downNetDelayRatio * 1).toFixed(2) + ' ms'
+              });
+            }
+
+            if (retansRatioNetDelayRatioCodes.includes('retansRatio')) {
+              linkOther.push({
+                'code': 'retansRatio',
+                'name': '重传率',
+                'ts': result.time,
+                'value': result.upRetransRatio + ' %' + '|' + result.downRetansRatio + ' %'
+              });
+            }
+
+            return _context8.abrupt("return", linkOther);
+
+          case 9:
+          case "end":
+            return _context8.stop();
+        }
+      }
+    }, _callee8);
+  }));
+  return _queryRetansRatioNetDelayRatio.apply(this, arguments);
 }

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

@@ -3,7 +3,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useRequest } from 'ahooks';
 import { useEffect, useState } from 'react';
 import { queryCiMonitorMetricCodes } from "../../../getCiDisplayMetricModels";
-import { checkMenu, isOpenFlow } from "../components/LinkTopo/services";
 /**
  * 概览指标定义
  * @param {*} props
@@ -35,7 +34,7 @@ var useMetricModels = function useMetricModels(props) {
 
   function _fetchData() {
     _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var monitorMetrics, ciMonitorMetricModels, checkMenus, isOpen, displayMetricModels, _metricCodes;
+      var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -51,67 +50,29 @@ var useMetricModels = function useMetricModels(props) {
                   return item === m.code;
                 });
               });
-              _context.next = 6;
-              return checkMenu();
 
-            case 6:
-              checkMenus = _context.sent;
-
-              if (!(checkMenus[0].passed == 'PASS' && resourceData.attributes.display_name && resourceData.attributes['network_link.is_crucial'])) {
-                _context.next = 12;
-                break;
-              }
-
-              _context.next = 10;
-              return isOpenFlow({
-                'name': resourceData.attributes.display_name
-              });
-
-            case 10:
-              isOpen = _context.sent;
-
-              //
-              if (isOpen) {
-                ciMonitorMetricModels.push({
-                  changeValue: null,
-                  code: "downNetDelayRatio",
-                  id: "downNetDelayRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "下行RTT时延",
-                  unit: "ms"
-                });
-                ciMonitorMetricModels.push({
-                  changeValue: null,
-                  code: "downRetansRatio",
-                  id: "downRetansRatio",
-                  isGoldMetric: true,
-                  key: null,
-                  name: "下行重传率",
-                  unit: "%"
-                });
-                ciMonitorMetricModels.push({
+              if (resourceData.attributes['network_link.is_crucial']) {
+                ciMonitorMetricModels.unshift({
                   changeValue: null,
-                  code: "upNetDelayRatio",
-                  id: "upNetDelayRatio",
+                  code: "netDelayRatio",
+                  id: "netDelayRatio",
                   isGoldMetric: true,
                   key: null,
-                  name: "上行RTT时延",
+                  name: "RTT时延",
                   unit: "ms"
                 });
-                ciMonitorMetricModels.push({
+                ciMonitorMetricModels.unshift({
                   changeValue: null,
-                  code: "upRetransRatio",
-                  id: "upRetransRatio",
+                  code: "retansRatio",
+                  id: "retansRatio",
                   isGoldMetric: true,
                   key: null,
-                  name: "上行重传率",
+                  name: "重传率",
                   unit: "%"
                 });
-              }
+              } // 未监控不显示指标，临时在这里处理
+
 
-            case 12:
-              // 未监控不显示指标，临时在这里处理
               if (!isMonite) {
                 ciMonitorMetricModels = [];
               }
@@ -143,7 +104,7 @@ var useMetricModels = function useMetricModels(props) {
 
               return _context.abrupt("return", displayMetricModels);
 
-            case 17:
+            case 10:
             case "end":
               return _context.stop();
           }

package/es/networkTopo/getTopoData.js

@@ -77,6 +77,7 @@ function _addLinkData() {
 
           case 4:
             networkLinks = _context.sent;
+            console.log("如果是网络链路，补充详情信息", networkLinks);
             otherLinks = links.filter(function (link) {
               return link.ciType !== 'network_link';
             });
@@ -85,7 +86,7 @@ function _addLinkData() {
               linkGroups: []
             }));
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/es/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -5,15 +5,15 @@ import { getLinksBetweenNodes } from "../utils/linkUtil"; // network_link.actual
 
 function calcEdgeWidth(actualBandwidth) {
   if (!actualBandwidth) {
-    return 2;
+    return 3;
   } else if (actualBandwidth <= 100) {
-    return 2;
-  } else if (actualBandwidth <= 1000) {
     return 3;
-  } else if (actualBandwidth <= 10000) {
+  } else if (actualBandwidth <= 1000) {
     return 4;
-  } else if (actualBandwidth > 10000) {
+  } else if (actualBandwidth <= 10000) {
     return 5;
+  } else if (actualBandwidth > 10000) {
+    return 6;
   }
 }
 

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

@@ -1,7 +1,7 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["groups", "resources"];
+var _excluded = ["groups", "resources", "exportLinkIdList"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
@@ -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 { processByConditionResult, processExitLink } from "../../utils/exitLinkUtil";
 var API_ROOT = TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -53,10 +54,16 @@ function prepareResourceParams(conditions, query) {
     dynamicCondition.sort = query.sortBy + " " + query.sortOrder;
   }
 
-  var fixedConditionIdList = staticRes || undefined;
   return {
     dynamicCondition: dynamicCondition,
-    fixedConditionIdList: fixedConditionIdList
+    fixedConditionIdList: (staticRes || []).filter(function (ciId) {
+      return !ciId.startsWith('ip:');
+    }),
+    linkIps: (staticRes || []).filter(function (ciId) {
+      return ciId.startsWith('ip:');
+    }).map(function (ciId) {
+      return ciId.replace('ip:', '');
+    })
   };
 }
 
@@ -401,38 +408,33 @@ export default _extends({
   */
   getTopoData: function getTopoData(id) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-      var _result$links, result;
+      var _result$nodes, _result$links;
 
+      var result;
       return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
             case 0:
-              _context12.prev = 0;
-              _context12.next = 3;
+              _context12.next = 2;
               return request.get(API_ROOT + "/structure/both/" + id);
 
-            case 3:
+            case 2:
               result = _context12.sent;
-              return _context12.abrupt("return", _extends({}, result, {
+              return _context12.abrupt("return", processExitLink(_extends({}, result, {
+                nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
                 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;
-              _context12.t0 = _context12["catch"](0);
-              rlog.debug('getTopoData-error', _context12.t0);
-              return _context12.abrupt("return", null);
-
-            case 11:
+            case 4:
             case "end":
               return _context12.stop();
           }
         }
-      }, _callee12, null, [[0, 7]]);
+      }, _callee12);
     }))();
   },
 
@@ -443,9 +445,9 @@ export default _extends({
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-      var _result$links2;
+      var _result$nodes2, _result$links2;
 
       var data, obj, result;
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
@@ -464,19 +466,18 @@ export default _extends({
 
               obj = prepareGroupParams(data);
               _context13.next = 5;
-              return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj, {
-                exportLinkIdList: exportLinkIdList
-              }));
+              return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj));
 
             case 5:
               result = _context13.sent;
-              return _context13.abrupt("return", _extends({}, result, {
+              return _context13.abrupt("return", processByConditionResult(_extends({}, result, {
+                nodes: (_result$nodes2 = result.nodes) !== null && _result$nodes2 !== void 0 ? _result$nodes2 : [],
                 links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
                   return _extends({}, item, {
                     ciType: 'network_link'
                   });
                 })
-              }));
+              }), obj.groups));
 
             case 7:
             case "end":
@@ -496,12 +497,12 @@ export default _extends({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      var groups, resources, otherConfig, newGroups, obj;
+      var groups, resources, exportLinkIdList, otherConfig, newGroups, obj;
       return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) {
           switch (_context14.prev = _context14.next) {
             case 0:
-              groups = config.groups, resources = config.resources, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
+              groups = config.groups, resources = config.resources, exportLinkIdList = config.exportLinkIdList, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
               newGroups = isAvailableArray(groups) ? groups : [];
 
               if (resources) {

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,257 @@
+import _extends from "@babel/runtime/helpers/extends";
+import { getNodes } from "../../utils/htElementUtils";
+
+function findPingNodeFromHt(nodes, ip) {
+  return nodes.find(function (node) {
+    return node.a('ciType') === "ping" && node.a('ipAddress') === ip;
+  });
+}
+
+function isPingHtNode(node, ip) {
+  return node.a('ciType') === "ping" && node.a('ipAddress') === ip;
+}
+
+function isIpHtNode(node, ip) {
+  return node.a("bindType") === 'ip' && node.a("bindIp") === ip;
+}
+
+export function buildIpNode(ip) {
+  return {
+    id: "ip:" + ip,
+    name: ip,
+    bindType: "ip",
+    // 绑定资源类型。关联资源 值为空，关联IP ip
+    bindIp: ip,
+    // TODO 所属区域，从序列化拿
+    // 'groupId': null,
+    // 'groupTag': null,
+    ipAddress: ip,
+    // '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";
+} // 判断拓扑图上ip是否唯一
+
+
+export function isUniqueIp(dataModel, ip, nodeElement) {
+  var nodes = getNodes(dataModel);
+  var isUnique = true;
+  console.log("nodes-nodeElement", nodes, nodeElement);
+
+  if (nodeElement) {
+    console.log("nodes-nodeElement---filter", nodes.filter(function (node) {
+      return node.getId() !== (nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.getId());
+    }));
+    var arr = nodes.filter(function (node) {
+      return node.getId() !== (nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.getId());
+    }).filter(function (node) {
+      return isPingHtNode(node, ip) || isIpHtNode(node, ip);
+    });
+    isUnique = arr.length === 0;
+    console.log("nodes-nodeElement---filter", arr, isUnique);
+  } else {
+    isUnique = nodes.filter(function (node) {
+      return node.a("ipAddress") === ip;
+    }).length === 0;
+  }
+
+  return isUnique;
+}
+/**
+ * 打开拓扑出口链路处理
+ * @param {*} topoData 
+ * @returns 
+ */
+
+export function processExitLink(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links; // 出口链路目的端设置为IP节点或者ping资源节点id
+
+  var newLinks = updateLinkTarget(links, nodes);
+
+  if (!topoData.serialize) {
+    return _extends({}, topoData, {
+      links: newLinks
+    });
+  }
+
+  var serialize = _extends({}, getHtSerialize(topoData.serialize)); // 历史数据升级
+
+
+  links.filter(isExitLink) // 升级V1.4前配置的出口链路目的端节点为IP节点
+  .forEach(function (link) {
+    return upgradeExitLinkTarget(link, serialize);
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+
+  newLinks = upgradeLinkTargetNotExisted(links); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
+
+  var ipNodes = getIpNodes(serialize, nodes);
+  return _extends({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks,
+    serialize: serialize
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+
+  function upgradeLinkTargetNotExisted(links) {
+    newLinks = links.map(function (link) {
+      if (!isExitLink(link) || link.target && nodes.find(function (node) {
+        return node.id === link.target;
+      })) {
+        return link;
+      }
+
+      var destinationIp = link.attributes['network_link.destination_ipv4'];
+      var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+      var target = link.target; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+
+      var targetSerialize = findElementSerializeById(serialize, target);
+
+      if (!targetSerialize) {
+        var linkSerialize = findElementSerializeById(serialize, link.id);
+
+        if (linkSerialize) {
+          // 根据链路序列化数据找目的端节点
+          // eslint-disable-next-line no-underscore-dangle
+          var targetNodeSerialize = serialize.d.find(function (item) {
+            return item.i === linkSerialize.p.target.__i;
+          });
+
+          if (targetNodeSerialize) {
+            target = targetNodeSerialize.p.tag;
+          }
+        }
+      }
+
+      return _extends({}, link, {
+        target: target
+      });
+    });
+    return newLinks;
+  }
+
+  function getIpNodes(serialize, nodes) {
+    // 从序列化获取关联的IP
+    var ips = serialize.d.filter(function (item) {
+      return item.a.bindType === 'ip';
+    }).map(function (item) {
+      return item.a.bindIp;
+    }).filter(function (item) {
+      return !!item;
+    }) // 过滤ping资源对应的ip
+    .filter(function (ip) {
+      return !findPingNode(nodes, ip);
+    });
+    return ips.map(buildIpNode);
+  }
+
+  function findIpNodeSerialize(serialize, ip) {
+    return serialize.d.find(function (item) {
+      return item.p.tag === "ip:" + ip;
+    });
+  }
+
+  function findElementSerializeById(serialize, id) {
+    return serialize.d.find(function (item) {
+      return item.a.id === id;
+    });
+  }
+  /**
+   * 链路在序列化存在且目的端不是ping资源、IP节点时，升级链路目的端序列化数据为IP节点
+   * @param {*} link 
+   */
+
+
+  function upgradeExitLinkTarget(link, serialize) {
+    var destinationIp = link.attributes['network_link.destination_ipv4'];
+    var linkSerialize = findElementSerializeById(serialize, link.id);
+
+    if (linkSerialize) {
+      // 根据链路序列化数据找目的端节点
+      // eslint-disable-next-line no-underscore-dangle
+      var targetNodeSerialize = serialize.d.find(function (item) {
+        return item.i === linkSerialize.p.target.__i;
+      });
+
+      if (!targetNodeSerialize.p.tag) {
+        targetNodeSerialize.a = _extends({}, targetNodeSerialize.a, buildIpNode(destinationIp), {
+          isbinding: true
+        });
+        targetNodeSerialize.p.tag = "ip:" + destinationIp;
+      }
+    }
+  }
+} // 从拓扑数据查找
+
+function findPingNode(nodes, ip) {
+  return nodes.find(function (node) {
+    return node.ciType === "ping" && (node.ipAddress || node.attributes.ipv4_address) === ip;
+  });
+} // 出口链路目的端设置为IP节点或者ping资源节点id
+
+
+function updateLinkTarget(links, nodes) {
+  var newLinks = links.map(function (link) {
+    if (!isExitLink(link) || link.target && nodes.find(function (node) {
+      return node.id === link.target;
+    })) {
+      return link;
+    }
+
+    var destinationIp = link.attributes['network_link.destination_ipv4'];
+    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+    var target = pingNode ? pingNode.id : "ip:" + destinationIp;
+    return _extends({}, link, {
+      target: target
+    });
+  });
+  return newLinks;
+}
+/**
+ * 编辑模式按资源查询拓扑数据处理出口链路target
+ * 1. 出口链路目的端设置为IP节点或者ping资源节点id
+ * 2. IP构造为node节点
+ * FIXME 移到frontend 网络拓扑编辑
+ * @param {*} topoData 
+ * @returns 
+ */
+
+
+export function processByConditionResult(topoData, groupConfigs) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var ipNodes = getIpNodes(groupConfigs, nodes); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+  var newLinks = updateLinkTarget(links, nodes);
+  return _extends({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks
+  });
+
+  function getIpNodes(groupConfigs, nodes) {
+    var ips = groupConfigs.map(function (g) {
+      return g.condition.linkIps;
+    }).reduce(function (result, groupIps) {
+      return [].concat(result, groupIps);
+    }, []) // 过滤ping资源对应的ip节点
+    .filter(function (ip) {
+      return !findPingNode(nodes, ip);
+    });
+    return ips.map(buildIpNode);
+  }
+}