diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-15 12:25:42 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-15 12:25:42 -0500 |
| commit | 59453fe8d56c678495b1caf0cb7faeba6aa87d0f (patch) | |
| tree | 5f902b92c79714cc616314c9ca090cf8b450e7db | |
| parent | c220bfd9d233ae0b18b5181eeafa2e70c17f7a30 (diff) | |
added injected to network dict oportion of tuple returned by get_instance_nw_info
| -rw-r--r-- | nova/network/manager.py | 3 | ||||
| -rw-r--r-- | nova/tests/test_xenapi.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 2de9e2d0d..d725be69f 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -420,7 +420,8 @@ class NetworkManager(manager.SchedulerDependentManager): "enabled": "1"} network_dict = { 'bridge': network['bridge'], - 'id': network['id']} + 'id': network['id'], + 'injected': network['injected']} info = { 'label': network['label'], 'gateway': network['gateway'], diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 8b71a1d76..7e8b09275 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -687,7 +687,7 @@ class XenAPIMigrateInstance(test.TestCase): stubs.stubout_session(self.stubs, stubs.FakeSessionForMigrationTests) stubs.stubout_loopingcall_start(self.stubs) conn = xenapi_conn.get_connection(False) - network_info = [({'bridge': 'fa0', 'id': 0}, + network_info = [({'bridge': 'fa0', 'id': 0, 'injected': False}, {'broadcast': '192.168.0.255', 'dns': ['192.168.0.1'], 'gateway': '192.168.0.1', |