← Back to branch summary

~ubuntu-branches/ubuntu/vivid/neutron/vivid-proposed

« back to all changes in this revision

Viewing changes to neutron/plugins/ml2/drivers/l2pop/db.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-03-30 11:17:19 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150330111719-h0gx7233p4jkkgfh
Tags: 1:2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1263539
* New upstream milestone release:
  - d/control: Align version requirements with upstream.
  - d/control: Add new dependency on oslo-log.
  - d/p/*: Rebase.
  - d/control,d/neutron-plugin-hyperv*: Dropped, decomposed into
    separate project upstream.
  - d/control,d/neutron-plugin-openflow*: Dropped, decomposed into
    separate project upstream.
  - d/neutron-common.install: Add neutron-rootwrap-daemon and 
    neutron-keepalived-state-change binaries.
  - d/rules: Ignore neutron-hyperv-agent when installing; only for Windows.
  - d/neutron-plugin-cisco.install: Drop neutron-cisco-cfg-agent as
    decomposed into separate project upstream.
  - d/neutron-plugin-vmware.install: Drop neutron-check-nsx-config and
    neutron-nsx-manage as decomposed into separate project upstream.
  - d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent.
* d/pydist-overrides: Add overrides for oslo packages.
* d/control: Fixup type in package description (LP: #1263539).
* d/p/fixup-driver-test-execution.patch: Cherry pick fix from upstream VCS
  to support unit test exection in out-of-tree vendor drivers.
* d/neutron-common.postinst: Allow general access to /etc/neutron but limit
  access to root/neutron to /etc/neutron/neutron.conf to support execution
  of unit tests in decomposed vendor drivers.
* d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent
  package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/plugins/ml2/drivers/l2pop/db.py
13
13
#    License for the specific language governing permissions and limitations
14
14
#    under the License.
15
15
 
16
 
from oslo.serialization import jsonutils
17
 
from oslo.utils import timeutils
18
 
from sqlalchemy import sql
 
16
from oslo_serialization import jsonutils
 
17
from oslo_utils import timeutils
19
18
 
20
19
from neutron.common import constants as const
21
20
from neutron.db import agents_db
56
55
                                     l2_const.SUPPORTED_AGENT_TYPES))
57
56
            return query.first()
58
57
 
59
 
    def get_network_ports(self, session, network_id):
 
58
    def _get_active_network_ports(self, session, network_id):
60
59
        with session.begin(subtransactions=True):
61
60
            query = session.query(ml2_models.PortBinding,
62
61
                                  agents_db.Agent)
65
64
                               ml2_models.PortBinding.host)
66
65
            query = query.join(models_v2.Port)
67
66
            query = query.filter(models_v2.Port.network_id == network_id,
68
 
                                 models_v2.Port.admin_state_up == sql.true(),
 
67
                                 models_v2.Port.status ==
 
68
                                 const.PORT_STATUS_ACTIVE,
69
69
                                 agents_db.Agent.agent_type.in_(
70
70
                                     l2_const.SUPPORTED_AGENT_TYPES))
71
71
            return query
72
72
 
73
 
    def get_nondvr_network_ports(self, session, network_id):
74
 
        query = self.get_network_ports(session, network_id)
 
73
    def get_nondvr_active_network_ports(self, session, network_id):
 
74
        query = self._get_active_network_ports(session, network_id)
75
75
        return query.filter(models_v2.Port.device_owner !=
76
76
                            const.DEVICE_OWNER_DVR_INTERFACE)
77
77
 
78
 
    def get_dvr_network_ports(self, session, network_id):
 
78
    def get_dvr_active_network_ports(self, session, network_id):
79
79
        with session.begin(subtransactions=True):
80
80
            query = session.query(ml2_models.DVRPortBinding,
81
81
                                  agents_db.Agent)
84
84
                               ml2_models.DVRPortBinding.host)
85
85
            query = query.join(models_v2.Port)
86
86
            query = query.filter(models_v2.Port.network_id == network_id,
87
 
                                 models_v2.Port.admin_state_up == sql.true(),
 
87
                                 models_v2.Port.status ==
 
88
                                 const.PORT_STATUS_ACTIVE,
88
89
                                 models_v2.Port.device_owner ==
89
90
                                 const.DEVICE_OWNER_DVR_INTERFACE,
90
91
                                 agents_db.Agent.agent_type.in_(