openstack
/
os-net-config
Code Issues Proposed changes

Removing the warnings generated due to yaml.load() 

Replaced yaml.load() with yaml.safe_load() to remove
the warnings and CI failure.

Change-Id: I1a7e77a6055567ea1b84170f0befd9c42f1c87d8
(cherry picked from commit 08445fabbd)
This commit is contained in:
Karthik S 2019-03-14 01:39:53 -04:00
parent ccbda4ee6d
commit 36a8fa9d2d
8 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os_net_config/cli.py
View File

@ -181,7 +181,7 @@ def main(argv=sys.argv):
if os.path.exists(opts.mapping_file):
logger.info('Using mapping file at: %s' % opts.mapping_file)
with open(opts.mapping_file) as cf:
iface_map = yaml.load(cf.read())
iface_map = yaml.safe_load(cf.read())
iface_mapping = iface_map.get("interface_mapping")
logger.debug('interface_mapping JSON: %s' % str(iface_mapping))
persist_mapping = opts.persist_mapping
@ -231,7 +231,7 @@ def main(argv=sys.argv):
if os.path.exists(opts.config_file):
try:
with open(opts.config_file) as cf:
iface_array = yaml.load(cf.read()).get("network_config")
iface_array = yaml.safe_load(cf.read()).get("network_config")
logger.debug('network_config JSON: %s' % str(iface_array))
except IOError:
logger.error("Error reading file: %s" % opts.config_file)

2
os_net_config/sriov_config.py
View File

@ -83,7 +83,7 @@ def get_file_data(filename):
def _get_sriov_map():
contents = get_file_data(_SRIOV_CONFIG_FILE)
sriov_map = yaml.load(contents) if contents else []
sriov_map = yaml.safe_load(contents) if contents else []
return sriov_map

12
os_net_config/tests/test_cli.py
View File

@ -221,14 +221,14 @@ class TestCli(base.TestCase):
'-c %s' % ivs_yaml)
self.assertEqual('', stderr)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
sriov_config_yaml = yaml.load(contents)
sriov_config_yaml = yaml.safe_load(contents)
os.remove(sriov_config._SRIOV_CONFIG_FILE)
stdout_json, stderr = self.run_cli('ARG0 --provider=ifcfg --noop '
'--exit-on-validation-errors '
'-c %s' % ivs_json)
self.assertEqual('', stderr)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
sriov_config_json = yaml.load(contents)
sriov_config_json = yaml.safe_load(contents)
sanity_devices = ['DEVICE=p2p1',
'DEVICE=p2p1_5',
'DEVICE=p2p1_1',
@ -252,14 +252,14 @@ class TestCli(base.TestCase):
'-c %s' % ivs_yaml)
self.assertEqual('', stderr)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
sriov_config_yaml = yaml.load(contents)
sriov_config_yaml = yaml.safe_load(contents)
os.remove(sriov_config._SRIOV_CONFIG_FILE)
stdout_json, stderr = self.run_cli('ARG0 --provider=ifcfg --noop '
'--exit-on-validation-errors '
'-c %s' % ivs_json)
self.assertEqual('', stderr)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
sriov_config_json = yaml.load(contents)
sriov_config_json = yaml.safe_load(contents)
sanity_devices = ['DEVICE=p2p1',
'DEVICE=p2p1_5',
'DEVICE=br-vfs',
@ -340,7 +340,7 @@ class TestCli(base.TestCase):
'--exit-on-validation-errors '
'-m %s' % mapping_report)
self.assertEqual('', stderr)
stdout_list = yaml.load(stdout)
stdout_list = yaml.safe_load(stdout)
self.assertEqual(stdout_list['nic1'], 'em1')
self.assertEqual(stdout_list['nic2'], 'em2')
self.assertEqual(stdout_list['nic3'], 'em4')
@ -357,7 +357,7 @@ class TestCli(base.TestCase):
'--exit-on-validation-errors '
'-m %s' % mapping_report)
self.assertEqual('', stderr)
stdout_list = yaml.load(stdout)
stdout_list = yaml.safe_load(stdout)
self.assertNotIn('em1', stdout_list.keys())
self.assertNotIn('em1', stdout_list.values())
self.assertEqual(stdout_list['em2'], 'em2')

16
os_net_config/tests/test_objects.py
View File

@ -378,7 +378,7 @@ class TestBridge(base.TestCase):
self.assertEqual("br-foo", interface1.bridge_name)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertListEqual(vf_final, vf_map)
def test_ovs_bond_with_vf_default(self):
@ -435,7 +435,7 @@ class TestBridge(base.TestCase):
self.assertEqual("br-foo", bond.bridge_name)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertListEqual(vf_final, vf_map)
def test_ovs_bond_with_vf_custom(self):
@ -490,7 +490,7 @@ class TestBridge(base.TestCase):
objects.object_from_json(json.loads(data))
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertListEqual(vf_final, vf_map)
def test_ovs_bridge_with_vf_param_provided(self):
@ -530,7 +530,7 @@ class TestBridge(base.TestCase):
self.assertEqual("br-foo", interface1.bridge_name)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertListEqual(vf_final, vf_map)
def test_ovs_user_bridge_with_vf_default(self):
@ -573,7 +573,7 @@ class TestBridge(base.TestCase):
self.assertEqual("br-foo", dpdk_interface.bridge_name)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertListEqual(vf_final, vf_map)
def test_ovs_user_bridge_with_param_set(self):
@ -619,7 +619,7 @@ class TestBridge(base.TestCase):
self.assertEqual("br-foo", dpdk_interface.bridge_name)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertListEqual(vf_final, vf_map)
def test_from_json_dhcp_with_nic1(self):
@ -1117,7 +1117,7 @@ class TestLinuxBond(base.TestCase):
self.assertEqual("em2", interface2.device)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertListEqual(vf_final, vf_map)
def test_linux_bond_with_vf_param_provided(self):
@ -1166,7 +1166,7 @@ class TestLinuxBond(base.TestCase):
objects.object_from_json(json.loads(data))
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertListEqual(vf_final, vf_map)

24
os_net_config/tests/test_utils.py
View File

@ -121,7 +121,7 @@ class TestUtils(base.TestCase):
def test_update_sriov_pf_map_new(self):
utils.update_sriov_pf_map('eth1', 10, False)
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
sriov_pf_map = yaml.load(contents) if contents else []
sriov_pf_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(sriov_pf_map))
test_sriov_pf_map = [{'device_type': 'pf', 'link_mode': 'legacy',
'name': 'eth1', 'numvfs': 10}]
@ -130,7 +130,7 @@ class TestUtils(base.TestCase):
def test_update_sriov_pf_map_new_with_promisc(self):
utils.update_sriov_pf_map('eth1', 10, False, promisc='off')
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
sriov_pf_map = yaml.load(contents) if contents else []
sriov_pf_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(sriov_pf_map))
test_sriov_pf_map = [{'device_type': 'pf', 'link_mode': 'legacy',
'name': 'eth1', 'numvfs': 10, 'promisc': 'off'}]
@ -146,7 +146,7 @@ class TestUtils(base.TestCase):
'name': 'eth1', 'numvfs': 20}]
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
pf_map = yaml.load(contents) if contents else []
pf_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(pf_map))
self.assertListEqual(pf_final, pf_map)
@ -160,14 +160,14 @@ class TestUtils(base.TestCase):
'name': 'eth1', 'numvfs': 20, 'promisc': 'on'}]
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
pf_map = yaml.load(contents) if contents else []
pf_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(pf_map))
self.assertListEqual(pf_final, pf_map)
def test_update_sriov_vf_map_minimal_new(self):
utils.update_sriov_vf_map('eth1', 2, 'eth1_2')
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
sriov_vf_map = yaml.load(contents) if contents else []
sriov_vf_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(sriov_vf_map))
test_sriov_vf_map = [{'device_type': 'vf', 'name': 'eth1_2',
'device': {"name": "eth1", "vfid": 2}}]
@ -178,7 +178,7 @@ class TestUtils(base.TestCase):
spoofcheck="on", trust="on", state="enable",
macaddr="AA:BB:CC:DD:EE:FF", promisc="off")
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
sriov_vf_map = yaml.load(contents) if contents else []
sriov_vf_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(sriov_vf_map))
test_sriov_vf_map = [{'device_type': 'vf', 'name': 'eth1_2',
'device': {'name': 'eth1', 'vfid': 2},
@ -206,7 +206,7 @@ class TestUtils(base.TestCase):
'promisc': 'off'}]
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(vf_map))
self.assertListEqual(vf_final, vf_map)
@ -232,7 +232,7 @@ class TestUtils(base.TestCase):
'promisc': 'on'}]
contents = utils.get_file_data(sriov_config._SRIOV_CONFIG_FILE)
vf_map = yaml.load(contents) if contents else []
vf_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(vf_map))
self.assertListEqual(vf_final, vf_map)
@ -446,7 +446,7 @@ class TestUtils(base.TestCase):
'vfio-pci')
contents = utils.get_file_data(utils._DPDK_MAPPING_FILE)
dpdk_map = yaml.load(contents) if contents else []
dpdk_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(dpdk_map))
dpdk_test = [{'name': 'eth1', 'pci_address': '0000:03:00.0',
'mac_address': '01:02:03:04:05:06',
@ -463,7 +463,7 @@ class TestUtils(base.TestCase):
'vfio-pci')
contents = utils.get_file_data(utils._DPDK_MAPPING_FILE)
dpdk_map = yaml.load(contents) if contents else []
dpdk_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(dpdk_map))
self.assertListEqual(dpdk_test, dpdk_map)
@ -482,7 +482,7 @@ class TestUtils(base.TestCase):
except IOError:
pass
dpdk_map = yaml.load(contents) if contents else []
dpdk_map = yaml.safe_load(contents) if contents else []
self.assertEqual(1, len(dpdk_map))
self.assertListEqual(dpdk_test, dpdk_map)
@ -702,6 +702,6 @@ dpdk {
{'name': 'eth2', 'pci_address': '0000:00:09.1',
'mac_address': '01:02:03:04:05:07',
'driver': 'vfio-pci'}]
dpdk_map = yaml.load(contents) if contents else []
dpdk_map = yaml.safe_load(contents) if contents else []
self.assertEqual(2, len(dpdk_map))
self.assertListEqual(dpdk_test, dpdk_map)

2
os_net_config/tests/test_validator.py
View File

@ -381,7 +381,7 @@ class TestSampleFiles(base.TestCase):
for sample_file in sample_files:
with open(sample_file, 'r') as f:
try:
config = yaml.load(f.read()).get("network_config")
config = yaml.safe_load(f.read()).get("network_config")
except Exception:
continue
if not config:

8
os_net_config/utils.py
View File

@ -220,7 +220,7 @@ def _ordered_nics(check_active):
# after it is bound to DPDK driver.
contents = get_file_data(_DPDK_MAPPING_FILE)
if contents:
dpdk_map = yaml.load(contents)
dpdk_map = yaml.safe_load(contents)
for item in dpdk_map:
nic = item['name']
if _is_embedded_nic(nic):
@ -402,13 +402,13 @@ def _update_dpdk_map(ifname, pci_address, mac_address, driver):
def _get_dpdk_map():
contents = get_file_data(_DPDK_MAPPING_FILE)
dpdk_map = yaml.load(contents) if contents else []
dpdk_map = yaml.safe_load(contents) if contents else []
return dpdk_map
def _get_dpdk_mac_address(name):
contents = get_file_data(_DPDK_MAPPING_FILE)
dpdk_map = yaml.load(contents) if contents else []
dpdk_map = yaml.safe_load(contents) if contents else []
for item in dpdk_map:
if item['name'] == name:
return item['mac_address']
@ -440,7 +440,7 @@ def update_sriov_pf_map(ifname, numvfs, noop, promisc=None,
def _get_sriov_map():
contents = get_file_data(sriov_config._SRIOV_CONFIG_FILE)
sriov_map = yaml.load(contents) if contents else []
sriov_map = yaml.safe_load(contents) if contents else []
return sriov_map

2
os_net_config/validator.py
View File

@ -24,7 +24,7 @@ import yaml
def get_os_net_config_schema():
"""Returns the schema for os_net_config's config files."""
schema_string = pkg_resources.resource_string(__name__, "schema.yaml")
return yaml.load(schema_string)
return yaml.safe_load(schema_string)
def get_schema_for_defined_type(defined_type):