test: 单元测试调整rel-22.07.06

3 files changed, 12 insertions, 11 deletions

diff --git a/nz-admin/src/test/resources/db/AssetAsset.sql b/nz-admin/src/test/resources/db/AssetAsset.sql
index dc0ae570..fedd18fe 100644
--- a/nz-admin/src/test/resources/db/AssetAsset.sql
+++ b/nz-admin/src/test/resources/db/AssetAsset.sql
@@ -10,4 +10,5 @@ VALUES
 (6, 'OAP-PE-T9K001-NPB06', '', '02CB041200078', -1, 3, 2, 3, 3, 1, 25, NULL, NULL, '10.231.11.5', NULL, '2021-11-03 09:15:29', '2021-11-19 14:02:29', 1, 1, NULL, 23, NULL, '', NULL, '', '', '', 5, '10.231.11.5', 10092, 'nezha', 'nezha', '088723c3', 1),
 (7, 'OAP-PE-T9K001-NPB07', '', '02CB041200078', -1, 3, 2, 3, 3, 1, 25, NULL, NULL, '10.231.11.5', NULL, '2021-11-03 09:15:29', '2021-11-19 14:02:29', 1, 1, NULL, 23, NULL, '', NULL, '', '', '', 5, '10.231.11.5', 10092, 'nezha', 'nezha', '088723c3', 1),
 (8, 'OAP-PE-T9K001-NPB08', '', '02CB041200078', -1, 3, 2, 3, 3, 1, 25, NULL, NULL, '10.231.11.5', NULL, '2021-11-03 09:15:29', '2021-11-19 14:02:29', 1, 1, NULL, 23, NULL, '', NULL, '', '', '', 5, '10.231.11.5', 10092, 'nezha', 'nezha', '088723c3', 1),
-(9, 'OAP-PE-T9K001-NPB09', '', '02CB041200078', -1, 3, 2, 3, 3, 1, 25, NULL, NULL, '10.231.11.5', NULL, '2021-11-03 09:15:29', '2021-11-19 14:02:29', 1, 1, NULL, 23, NULL, '', NULL, '', '', '', 5, '10.231.11.5', 10092, 'nezha', 'nezha', '088723c3', 1);
+(9, 'OAP-PE-T9K001-NPB09', '', '02CB041200078', -1, 3, 2, 3, 3, 1, 25, NULL, NULL, '10.231.11.5', NULL, '2021-11-03 09:15:29', '2021-11-19 14:02:29', 1, 1, NULL, 23, NULL, '', NULL, '', '', '', 5, '10.231.11.5', 10092, 'nezha', 'nezha', '088723c3', 1),
+(10, 'OAP-PE-T9K001-NPB09', '', '02CB041200078', -1, 3, 2, 3, 3, 1, 25, NULL, NULL, '192.168.66.1', NULL, '2021-11-03 09:15:29', '2021-11-19 14:02:29', 1, 1, NULL, 23, NULL, '', NULL, '', '', '', 5, '192.168.66.1', 10092, 'nezha', 'nezha', '088723c3', 1);
diff --git a/nz-admin/src/test/resources/parameters/ipam/IpamIpTestParameter.json b/nz-admin/src/test/resources/parameters/ipam/IpamIpTestParameter.json
index 333bd3ed..c32764dd 100644
--- a/nz-admin/src/test/resources/parameters/ipam/IpamIpTestParameter.json
+++ b/nz-admin/src/test/resources/parameters/ipam/IpamIpTestParameter.json
@@ -76,14 +76,14 @@
     "remark": ""
   },
   "saveIpamIp_addrerror": {
-  "name": "node-7",
+  "name": "node-8",
   "addr": "192.168.88.1.1",
   "mac": "1g:1b:6b:1d:65:1d",
   "state": 1,
   "remark": ""
   },
   "saveIpamIp_subnetisnull": {
-    "name": "node-7",
+    "name": "node-8",
     "addr": "127.0.0.1",
     "mac": "1g:1b:6b:1d:65:1d",
     "state": 1,
diff --git a/nz-admin/src/test/resources/parameters/ipam/IpamSubnetTestParameter.json b/nz-admin/src/test/resources/parameters/ipam/IpamSubnetTestParameter.json
index 5f68f220..0fb70ee8 100644
--- a/nz-admin/src/test/resources/parameters/ipam/IpamSubnetTestParameter.json
+++ b/nz-admin/src/test/resources/parameters/ipam/IpamSubnetTestParameter.json
@@ -1,7 +1,7 @@
 {
   "------------------ POST  /ipam/subnet data---------------------": "note",
   "saveIpamSubnet_success": {
-    "name": "IpamSubnetTest",
+    "name": "IpamSubnetTest10",
     "type": 4,
     "dcId": 1,
     "addr": "192.168.64.1",
@@ -31,7 +31,7 @@
     "cap": 256
   },
   "saveIpamSubnet_checkTypeCorrect": {
-    "name": "IpamSubnetTest",
+    "name": "IpamSubnetTest7",
     "type": 5,
     "dcId": 1,
     "addr": "192.168.40.1",
@@ -51,7 +51,7 @@
     "cap": 256
   },
   "saveIpamSubnet_checkDcCorrect": {
-    "name": "IpamSubnetTest",
+    "name": "IpamSubnetTest5",
     "type": 4,
     "dcId": 100,
     "addr": "192.168.60.1",
@@ -71,7 +71,7 @@
     "cap": 256
   },
   "saveIpamSubnet_checkV4AddrCorrect": {
-    "name": "IpamSubnetTest",
+    "name": "IpamSubnetTest6",
     "type": 4,
     "dcId": 1,
     "addr": "192.168.40.300",
@@ -81,7 +81,7 @@
     "cap": 256
   },
   "saveIpamSubnet_checkV6AddrCorrect": {
-    "name": "IpamSubnetTest",
+    "name": "IpamSubnetTest7",
     "type": 6,
     "dcId": 1,
     "addr": "0000:0000:0000:0000:0000:0000:c0a8",
@@ -101,7 +101,7 @@
     "cap": 256
   },
   "saveIpamSubnet_checkV4MaskCorrect": {
-    "name": "IpamSubnetTest",
+    "name": "IpamSubnetTest1",
     "type": 4,
     "dcId": 1,
     "addr": "192.168.40.1",
@@ -111,7 +111,7 @@
     "cap": 256
   },
   "saveIpamSubnet_checkV6MaskCorrect": {
-    "name": "IpamSubnetTest",
+    "name": "IpamSubnetTest7",
     "type": 6,
     "dcId": 1,
     "addr": "0000:0000:0000:0000:0000:0000:c0a8:2801",
@@ -123,7 +123,7 @@
   "------------------ PUT  /ipam/subnet data---------------------": "note",
   "updateIpamSubnet_success": {
     "id": 2,
-    "name": "IpamSubnetTest",
+    "name": "IpamSubnetTest9",
     "type": 4,
     "dcId": 1,
     "addr": "192.168.70.1",