diff options
| author | Trey Morris <treyemorris@gmail.com> | 2012-01-09 11:52:53 -0600 |
|---|---|---|
| committer | Trey Morris <treyemorris@gmail.com> | 2012-02-01 13:29:14 -0600 |
| commit | 73fd7abacd3bc5492b0335b3bb71c16b4a9d30e2 (patch) | |
| tree | 571ee661373cfc18b1ca1135e2b8c36d6758c641 /nova/virt | |
| parent | fced0f58bcbaef6fff76c6719e27e7d100aa721b (diff) | |
Ties quantum, melange, and nova network model
get_instance_nw_info() now returns network model, and keeps the network
info cache up to date.
virt shim and translation in place for virts to get at the old stuff
Change-Id: I070ea7d8564af6c644059d1c209542d250d19ddb
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/driver.py | 7 | ||||
| -rw-r--r-- | nova/virt/xenapi/vif.py | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nova/virt/driver.py b/nova/virt/driver.py index fa40160f6..84037e6dd 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -605,3 +605,10 @@ class ComputeDriver(object): Note that this function takes an instance ID. """ raise NotImplementedError() + + def legacy_nwinfo(self): + """ + Indicate if the driver requires the legacy network_info format. + """ + # TODO(tr3buchet): update all subclasses and remove this + return True diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py index 80278e8c6..c1b752d5a 100644 --- a/nova/virt/xenapi/vif.py +++ b/nova/virt/xenapi/vif.py @@ -34,7 +34,6 @@ xenapi_ovs_integration_bridge_opt = \ FLAGS = flags.FLAGS FLAGS.add_option(xenapi_ovs_integration_bridge_opt) - LOG = logging.getLogger("nova.virt.xenapi.vif") @@ -145,7 +144,7 @@ class XenAPIOpenVswitchDriver(XenVIFDriver): # with OVS model, always plug into an OVS integration bridge # that is already created network_ref = NetworkHelper.find_network_with_bridge(self._session, - FLAGS.xenapi_ovs_integration_bridge) + FLAGS.xenapi_ovs_integration_bridge) vif_rec = {} vif_rec['device'] = str(device) vif_rec['network'] = network_ref |