Merge branch 'develop' of https://git.mesalab.cn/zhaokun/tsg_ui_script into develop

4 files changed, 25 insertions, 14 deletions

diff --git a/testdata/ui_data/objects_data/fqdns.json b/testdata/ui_data/objects_data/fqdns.json
index f0126b73..064f3af0 100644
--- a/testdata/ui_data/objects_data/fqdns.json
+++ b/testdata/ui_data/objects_data/fqdns.json
@@ -229,10 +229,9 @@
         "model": "0",
         "type": "import_files",
         "files_type": "true_files",
-        "files_name": "ip_true_files_5w.txt"
+        "files_name": "fqdn_true_5w.txt"
       },
       "Createtype": "IP",
-      "isRepetition": "",
       "Subtype": "",
       "Search_type": "ID"
     }
diff --git a/testdata/ui_data/objects_data/keywords.json b/testdata/ui_data/objects_data/keywords.json
index 1cf79161..abd3b0ed 100644
--- a/testdata/ui_data/objects_data/keywords.json
+++ b/testdata/ui_data/objects_data/keywords.json
@@ -122,7 +122,7 @@
       "Create":{
         "model": "0",
         "type": "import_files",
-        "files_type": "True_file",
+        "files_type": "true_files",
         "files_name": "keywords_True导入文件.txt"
       },
       "range":"",
@@ -135,7 +135,7 @@
       "Create":{
         "model": "0",
         "type": "import_files",
-        "files_type": "True_file",
+        "files_type": "true_files",
         "files_name": "keywords_True导入文件.txt"
       },
       "range":"",
@@ -259,7 +259,7 @@
       "Create":{
         "model": "0",
         "type": "import_files",
-        "files_type": "True_file",
+        "files_type": "true_files",
         "files_name": "keywords_true_5w.txt"
       },
       "range":"",
diff --git a/testdata/ui_data/objects_data/moible_identities.json b/testdata/ui_data/objects_data/moible_identities.json
index a55f57d1..9242544c 100644
--- a/testdata/ui_data/objects_data/moible_identities.json
+++ b/testdata/ui_data/objects_data/moible_identities.json
@@ -2,7 +2,7 @@
   "comment1": "moible_identities操作参数",
   "comment2": "Create参数，0为创建moible_identities，1为创建moible_identities_group,2为不创建",
   "comment3": "其它参数注解：1.type in（A、AAAA、CNAME）。",
-  "comment4": "上传文件时，Subtype有四种类型，1、正确文件True_file、2、错误格式文件error_format_file、3、错误类型文件error_type_file、4、错误item文件error_item",
+  "comment4": "上传文件时，Subtype有四种类型，1、正确文件true_files、2、错误格式文件error_format_file、3、错误类型文件error_type_file、4、错误item文件error_item",
   "item": [
             {
               "ids": "用例1、创建IMSI、查询IMSI、删除IMSI",
@@ -229,7 +229,7 @@
       "Create":{
         "model": "0",
         "type": "import_files",
-        "files_type": "True_file",
+        "files_type": "true_files",
         "files_name": "moible_identities_True导入文件.txt"
       },
       "Createtype": "IMSI",
@@ -242,12 +242,24 @@
       "Create":{
         "model": "1",
         "type": "import_files",
-        "files_type": "True_file",
+        "files_type": "true_files",
         "files_name": "moible_identities_True导入文件.txt"
       },
       "Createtype": "IMSI",
       "Subtype":"",
       "Search_type": "ID"
+    },{
+      "ids": "25-2、IMSI导入5w",
+      "Name": "test-1",
+      "Create":{
+        "model": "0",
+        "type": "import_files",
+        "files_type": "true_files",
+        "files_name": "moible_identities_5w_True导入文件.txt"
+      },
+      "Createtype": "IMSI",
+      "Subtype":"",
+      "Search_type": "ID"
     },
     {
       "ids": "26-1、Phone_number增量导入",
@@ -255,7 +267,7 @@
       "Create":{
         "model": "0",
         "type": "import_files",
-        "files_type": "True_file",
+        "files_type": "true_files",
         "files_name": "moible_identities_True导入文件.txt"
       },
       "Createtype": "Phone_Number",
@@ -268,7 +280,7 @@
       "Create":{
         "model": "1",
         "type": "import_files",
-        "files_type": "True_file",
+        "files_type": "true_files",
         "files_name": "moible_identities_True导入文件.txt"
       },
       "Createtype": "Phone_Number",
@@ -282,7 +294,7 @@
             "model": "0",
             "type": "new_object",
             "item": ["12312312321*"],
-            "files_type": "True_file",
+            "files_type": "true_files",
             "files_name": "moible_identities_True导入文件.txt"
         },
         "Createtype": "IMSI",
diff --git a/testdata/ui_data/objects_data/subscriber_ids.json b/testdata/ui_data/objects_data/subscriber_ids.json
index 711cac86..a6672277 100644
--- a/testdata/ui_data/objects_data/subscriber_ids.json
+++ b/testdata/ui_data/objects_data/subscriber_ids.json
@@ -113,7 +113,7 @@
       "Create":{
         "model": "0",
         "type": "import_files",
-        "files_type":"true_file",
+        "files_type":"true_files",
         "files_name":"Subscriber_IDs_true_file.txt"
           },
       "Createtype": "Subscriber_IDs",
@@ -161,7 +161,7 @@
       "Create":{
         "model": "1",
         "type": "import_files",
-        "files_type":"true_file",
+        "files_type":"true_files",
         "files_name":"Subscriber_IDs_true_file.txt"
           },
       "Createtype": "Subscriber_IDs",
@@ -251,7 +251,7 @@
       "Create":{
         "model": "0",
         "type": "import_files",
-        "files_type":"true_file",
+        "files_type":"true_files",
         "files_name":"sub_id_true_5w.txt"
           },
       "Createtype": "Subscriber_IDs",