added eagerloading mac adddresses for instance

2 files changed, 16 insertions, 0 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 7d272fdb4..fb05556f7 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -956,6 +956,7 @@ def instance_get(context, instance_id, session=None):
     if is_admin_context(context):
         result = session.query(models.Instance).\
                          options(joinedload_all('fixed_ips.floating_ips')).\
+                         options(joinedload('mac_addresses')).\
                          options(joinedload_all('security_groups.rules')).\
                          options(joinedload('volumes')).\
                          options(joinedload_all('fixed_ips.network')).\
@@ -967,6 +968,7 @@ def instance_get(context, instance_id, session=None):
     elif is_user_context(context):
         result = session.query(models.Instance).\
                          options(joinedload_all('fixed_ips.floating_ips')).\
+                         options(joinedload('mac_addresses')).\
                          options(joinedload_all('security_groups.rules')).\
                          options(joinedload('volumes')).\
                          options(joinedload('metadata')).\
@@ -988,6 +990,7 @@ def instance_get_all(context):
     session = get_session()
     return session.query(models.Instance).\
                    options(joinedload_all('fixed_ips.floating_ips')).\
+                   options(joinedload('mac_addresses')).\
                    options(joinedload('security_groups')).\
                    options(joinedload_all('fixed_ips.network')).\
                    options(joinedload('instance_type')).\
@@ -1000,6 +1003,7 @@ def instance_get_all_by_user(context, user_id):
     session = get_session()
     return session.query(models.Instance).\
                    options(joinedload_all('fixed_ips.floating_ips')).\
+                   options(joinedload('mac_addresses')).\
                    options(joinedload('security_groups')).\
                    options(joinedload_all('fixed_ips.network')).\
                    options(joinedload('instance_type')).\
@@ -1013,6 +1017,7 @@ def instance_get_all_by_host(context, host):
     session = get_session()
     return session.query(models.Instance).\
                    options(joinedload_all('fixed_ips.floating_ips')).\
+                   options(joinedload('mac_addresses')).\
                    options(joinedload('security_groups')).\
                    options(joinedload_all('fixed_ips.network')).\
                    options(joinedload('instance_type')).\
@@ -1028,6 +1033,7 @@ def instance_get_all_by_project(context, project_id):
     session = get_session()
     return session.query(models.Instance).\
                    options(joinedload_all('fixed_ips.floating_ips')).\
+                   options(joinedload('mac_addresses')).\
                    options(joinedload('security_groups')).\
                    options(joinedload_all('fixed_ips.network')).\
                    options(joinedload('instance_type')).\
@@ -1043,6 +1049,7 @@ def instance_get_all_by_reservation(context, reservation_id):
     if is_admin_context(context):
         return session.query(models.Instance).\
                        options(joinedload_all('fixed_ips.floating_ips')).\
+                       options(joinedload('mac_addresses')).\
                        options(joinedload('security_groups')).\
                        options(joinedload_all('fixed_ips.network')).\
                        options(joinedload('instance_type')).\
@@ -1052,6 +1059,7 @@ def instance_get_all_by_reservation(context, reservation_id):
     elif is_user_context(context):
         return session.query(models.Instance).\
                        options(joinedload_all('fixed_ips.floating_ips')).\
+                       options(joinedload('mac_addresses')).\
                        options(joinedload('security_groups')).\
                        options(joinedload_all('fixed_ips.network')).\
                        options(joinedload('instance_type')).\
@@ -1066,6 +1074,7 @@ def instance_get_project_vpn(context, project_id):
     session = get_session()
     return session.query(models.Instance).\
                    options(joinedload_all('fixed_ips.floating_ips')).\
+                   options(joinedload('mac_addresses')).\
                    options(joinedload('security_groups')).\
                    options(joinedload('instance_type')).\
                    filter_by(project_id=project_id).\
diff --git a/nova/network/manager.py b/nova/network/manager.py
index be825dd80..aedaa7c21 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -797,6 +797,13 @@ class VlanManager(NetworkManager):
 
         return host
 
+    def set_network_hosts(self, context):
+        """skip setting network hosts in vlan, if there is ever a need
+        for a nonhomogeneous network setup, this function would be removed in
+        favor of the super class function
+        """
+        pass
+
     def _on_set_network_host(self, context, network_id):
         """Called when this host becomes the host for a network."""
         network_ref = self.db.network_get(context, network_id)