x
/
deb-os-vif
Code Issues Proposed changes

Change network vlan to integer 

Change-Id: I10e327d6a1dbffbdca92b767b25f7b9de1f8c540
This commit is contained in:
Moshe Levi 2016-02-22 15:55:41 +02:00
parent c32d2a6e67
commit b2a910ca48
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_vif/objects/network.py
View File

@ -32,7 +32,7 @@ class Network(osv_base.VersionedObject):
'should_provide_bridge': fields.BooleanField(),
'should_provide_vlan': fields.BooleanField(),
'bridge_interface': fields.StringField(nullable=True),
'vlan': fields.StringField(nullable=True),
'vlan': fields.IntegerField(nullable=True),
}
def __init__(self, **kwargs):

2
os_vif/tests/test_vif.py
View File

@ -99,7 +99,7 @@ object_data = {
'FixedIP': '1.0-d1a0ec7e7b6ce021a784c54d44cce009',
'FixedIPList': '1.0-15ecf022a68ddbb8c2a6739cfc9f8f5e',
'InstanceInfo': '1.0-84104d3435046b1a282ac8265ec2a976',
'Network': '1.0-8016e04215203cd86a2b9578ed75afcd',
'Network': '1.0-14d4787990b079f230423fcc364abf91',
'Route': '1.0-5ca049cb82c4d4ec5edb1b839c1429c7',
'RouteList': '1.0-15ecf022a68ddbb8c2a6739cfc9f8f5e',
'Subnet': '1.0-6a8c192ef7492120d1a5e0fd08e44272',

2
vif_plug_linux_bridge/tests/test_plugin.py
View File

@ -112,4 +112,4 @@ class PluginTest(testtools.TestCase):
self.assertEqual(len(mock_ensure_bridge.calls), 0)
mock_ensure_vlan_bridge.assert_called_with(
"99", "br0", "eth0", mtu=1500)
99, "br0", "eth0", mtu=1500)