x/vmware-nsx
Code Issues Proposed changes

Merge "Define VIF_TYPE_DVS in vmware-nsx repo"

Browse Source
This commit is contained in:
Jenkins 2015-08-27 01:33:01 +00:00 committed by Gerrit Code Review
commit 4913fab018
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vmware_nsx/neutron/plugins/vmware/common/nsx_constants.py
View File

@ -38,3 +38,6 @@ ROUTER_TYPE_TIER0 = "TIER0"
ROUTER_TYPE_TIER1 = "TIER1" ROUTER_TYPE_TIER1 = "TIER1"
ROUTER_TYPES = [ROUTER_TYPE_TIER0, ROUTER_TYPE_TIER1] ROUTER_TYPES = [ROUTER_TYPE_TIER0, ROUTER_TYPE_TIER1]
# L2 agent vif type
VIF_TYPE_DVS = 'dvs'

3
vmware_nsx/neutron/plugins/vmware/plugins/dvs.py
View File

@ -42,6 +42,7 @@ from neutron.plugins.common import utils
from vmware_nsx.neutron.plugins import vmware from vmware_nsx.neutron.plugins import vmware
from vmware_nsx.neutron.plugins.vmware.common import config # noqa from vmware_nsx.neutron.plugins.vmware.common import config # noqa
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_constants
from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db
from vmware_nsx.neutron.plugins.vmware import dhcpmeta_modes from vmware_nsx.neutron.plugins.vmware import dhcpmeta_modes
@ -84,7 +85,7 @@ class NsxDvsV2(addr_pair_db.AllowedAddressPairsMixin,
# Common driver code # Common driver code
self.base_binding_dict = { self.base_binding_dict = {
pbin.VIF_TYPE: pbin.VIF_TYPE_DVS, pbin.VIF_TYPE: nsx_constants.VIF_TYPE_DVS,
pbin.VIF_DETAILS: { pbin.VIF_DETAILS: {
# TODO(rkukura): Replace with new VIF security details # TODO(rkukura): Replace with new VIF security details
pbin.CAP_PORT_FILTER: pbin.CAP_PORT_FILTER:

3
vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py
View File

@ -54,6 +54,7 @@ from vmware_nsx.neutron.plugins import vmware
from vmware_nsx.neutron.plugins.vmware.common import config # noqa from vmware_nsx.neutron.plugins.vmware.common import config # noqa
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import locking from vmware_nsx.neutron.plugins.vmware.common import locking
from vmware_nsx.neutron.plugins.vmware.common import nsx_constants
from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import ( from vmware_nsx.neutron.plugins.vmware.dbexts import (
routertype as rt_rtr) routertype as rt_rtr)
@ -117,7 +118,7 @@ class NsxVPluginV2(agents_db.AgentDbMixin,
self.base_binding_dict = { self.base_binding_dict = {
pbin.VNIC_TYPE: pbin.VNIC_NORMAL, pbin.VNIC_TYPE: pbin.VNIC_NORMAL,
pbin.VIF_TYPE: pbin.VIF_TYPE_DVS, pbin.VIF_TYPE: nsx_constants.VIF_TYPE_DVS,
pbin.VIF_DETAILS: { pbin.VIF_DETAILS: {
# TODO(rkukura): Replace with new VIF security details # TODO(rkukura): Replace with new VIF security details
pbin.CAP_PORT_FILTER: pbin.CAP_PORT_FILTER:

3
vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py
View File

@ -45,6 +45,7 @@ from oslo_utils import uuidutils
import six import six
import webob.exc import webob.exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_constants
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db
from vmware_nsx.neutron.plugins.vmware.extensions import ( from vmware_nsx.neutron.plugins.vmware.extensions import (
routertype as router_type) routertype as router_type)
@ -317,7 +318,7 @@ class TestPortsV2(NsxVPluginV2TestCase,
test_bindings.PortBindingsHostTestCaseMixin, test_bindings.PortBindingsHostTestCaseMixin,
test_bindings.PortBindingsVnicTestCaseMixin): test_bindings.PortBindingsVnicTestCaseMixin):
VIF_TYPE = portbindings.VIF_TYPE_DVS VIF_TYPE = nsx_constants.VIF_TYPE_DVS
HAS_PORT_FILTER = True HAS_PORT_FILTER = True
def test_create_port_json(self): def test_create_port_json(self):