Fix test cases after sample yang files name changes

zhenggen-xu · May 1, 2020 · ba5cc32 · ba5cc32
1 parent 2f315ee
commit ba5cc32
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/sonic-yang-mgmt/tests/libyang-python-tests/sonic_config_data.json b/src/sonic-yang-mgmt/tests/libyang-python-tests/sonic_config_data.json
@@ -1,6 +1,6 @@
 {
-	"sonic-vlan:sonic-vlan": {
-		"sonic-vlan:VLAN_INTERFACE": {
+	"test-sonic-vlan:sonic-vlan": {
+		"test-sonic-vlan:VLAN_INTERFACE": {
 			"VLAN_INTERFACE_LIST": [{
 					"vlanid": 111,
 					"ip-prefix": "2000:f500:45:6709::1/64",
@@ -40,7 +40,7 @@
 			]
 		},
 
-		"sonic-vlan:VLAN": {
+		"test-sonic-vlan:VLAN": {
 			"VLAN_LIST": [{
 					"vlanid": 111,
 					"description": "server_vlan",
@@ -78,7 +78,7 @@
 			]
 		},
 
-		"sonic-vlan:VLAN_MEMBER": {
+		"test-sonic-vlan:VLAN_MEMBER": {
 			"VLAN_MEMBER_LIST": [{
 					"vlanid": 111,
 					"port": "Ethernet0",
@@ -117,8 +117,8 @@
 			]
 		}
 	},
-	"sonic-port:sonic-port": {
-		"sonic-port:PORT": {
+	"test-sonic-port:sonic-port": {
+		"test-sonic-port:PORT": {
 			"PORT_LIST": [{
 					"port_name": "Ethernet0",
 					"alias": "eth0",
@@ -203,8 +203,8 @@
 		}
 	},
 
-	"sonic-acl:sonic-acl": {
-		"sonic-acl:ACL_RULE": {
+	"test-sonic-acl:sonic-acl": {
+		"test-sonic-acl:ACL_RULE": {
 			"ACL_RULE_LIST": [{
 					"ACL_TABLE_NAME": "PACL-V4",
 					"RULE_NAME": "Rule_20",
@@ -237,7 +237,7 @@
 			]
 		},
 
-		"sonic-acl:ACL_TABLE": {
+		"test-sonic-acl:ACL_TABLE": {
 			"ACL_TABLE_LIST": [{
 					"ACL_TABLE_NAME": "PACL-V6",
 					"policy_desc": "Filter IPv6",
@@ -256,8 +256,8 @@
 		}
 	},
 
-	"sonic-interface:sonic-interface": {
-		"sonic-interface:INTERFACE": {
+	"test-sonic-interface:sonic-interface": {
+		"test-sonic-interface:INTERFACE": {
 			"INTERFACE_LIST": [{
 					"interface": "Ethernet8",
 					"ip-prefix": "10.1.1.65/26",

diff --git a/src/sonic-yang-mgmt/tests/libyang-python-tests/test_SonicYang.json b/src/sonic-yang-mgmt/tests/libyang-python-tests/test_SonicYang.json
@@ -107,15 +107,15 @@
            "parent":"/test-sonic-port:sonic-port/PORT/PORT_LIST[port_name='Ethernet9']"}
  ],
   "prefix":[
-    {"module_name":"test-sonic-head", "module_prefix":"test-sonic-head"},
-    {"module_name":"test-sonic-port", "module_prefix":"test-sonic-port"},
-    {"module_name":"test-sonic-acl",  "module_prefix":"test-sonic-acl"},
-    {"module_name":"test-sonic-interface", "module_prefix":"test-sonic-intf"},
-    {"module_name":"test-sonic-portchannel", "module_prefix":"test-sonic-lag"},
-    {"module_name":"test-sonic-vlan", "module_prefix":"test-sonic-vlan"}
+    {"module_name":"test-sonic-head", "module_prefix":"sonic-head"},
+    {"module_name":"test-sonic-port", "module_prefix":"port"},
+    {"module_name":"test-sonic-acl",  "module_prefix":"acl"},
+    {"module_name":"test-sonic-interface", "module_prefix":"intf"},
+    {"module_name":"test-sonic-portchannel", "module_prefix":"lag"},
+    {"module_name":"test-sonic-vlan", "module_prefix":"vlan"}
     ],
   "data_type":[
-    {"xpath":"/test-sonic-port:sonic-port/test-sonic-port:PORT/sonic-port:PORT_LIST/test-sonic-port:port_name", "data_type":"LY_TYPE_STRING"},
+    {"xpath":"/test-sonic-port:sonic-port/test-sonic-port:PORT/test-sonic-port:PORT_LIST/test-sonic-port:port_name", "data_type":"LY_TYPE_STRING"},
     {"xpath":"/test-sonic-vlan:sonic-vlan/test-sonic-vlan:VLAN_INTERFACE/test-sonic-vlan:VLAN_INTERFACE_LIST/test-sonic-vlan:vlanid", "data_type":"LY_TYPE_LEAFREF"}
     ],
   "leafref_type":[

diff --git a/src/sonic-yang-mgmt/tests/libyang-python-tests/test_sonic_yang.py b/src/sonic-yang-mgmt/tests/libyang-python-tests/test_sonic_yang.py
@@ -167,7 +167,7 @@ def test_delete_node(self, data, yang_s):
         for node in data['delete_nodes']:
             expected = node['valid']
             xpath = str(node['xpath'])
-            yang_s.delete_data_node(xpath)
+            yang_s._delete_node(xpath)
 
     #test set node's value
     def test_set_datanode_value(self, data, yang_s):