diff --git a/os_vif/objects/network.py b/os_vif/objects/network.py index 1c4674a..7a5eb34 100644 --- a/os_vif/objects/network.py +++ b/os_vif/objects/network.py @@ -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): diff --git a/os_vif/tests/test_vif.py b/os_vif/tests/test_vif.py index 2868bc5..b4ee2db 100644 --- a/os_vif/tests/test_vif.py +++ b/os_vif/tests/test_vif.py @@ -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', diff --git a/vif_plug_linux_bridge/tests/test_plugin.py b/vif_plug_linux_bridge/tests/test_plugin.py index ef53920..e69b7cd 100644 --- a/vif_plug_linux_bridge/tests/test_plugin.py +++ b/vif_plug_linux_bridge/tests/test_plugin.py @@ -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)