openstack/neutron
Code Issues Proposed changes

Merge "ovs/sriov mech drivers: resource_provider_uuid5_namespace"

Browse Source
This commit is contained in:
Zuul 2018-11-08 12:04:36 +00:00 committed by Gerrit Code Review
commit 6efb09fe22
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py
View File

@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import uuid
from neutron_lib.api.definitions import portbindings from neutron_lib.api.definitions import portbindings
from neutron_lib import constants from neutron_lib import constants
from neutron_lib.plugins.ml2 import api from neutron_lib.plugins.ml2 import api
@ -47,6 +49,9 @@ class SriovNicSwitchMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
L2 Agent presents in order to manage port update events. L2 Agent presents in order to manage port update events.
""" """
resource_provider_uuid5_namespace = uuid.UUID(
'87f1895c-73bb-11e8-9008-c4d987b2a692')
def __init__(self, def __init__(self,
agent_type=constants.AGENT_TYPE_NIC_SWITCH, agent_type=constants.AGENT_TYPE_NIC_SWITCH,
vif_details={portbindings.CAP_PORT_FILTER: False}, vif_details={portbindings.CAP_PORT_FILTER: False},

4
neutron/plugins/ml2/drivers/openvswitch/mech_driver/mech_openvswitch.py
View File

@ -14,6 +14,7 @@
# under the License. # under the License.
import os import os
import uuid
from neutron_lib.api.definitions import portbindings from neutron_lib.api.definitions import portbindings
from neutron_lib.callbacks import events from neutron_lib.callbacks import events
@ -48,6 +49,9 @@ class OpenvswitchMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
network. network.
""" """
resource_provider_uuid5_namespace = uuid.UUID(
'87ee7d5c-73bb-11e8-9008-c4d987b2a692')
def __init__(self): def __init__(self):
sg_enabled = securitygroups_rpc.is_firewall_enabled() sg_enabled = securitygroups_rpc.is_firewall_enabled()
hybrid_plug_required = (not cfg.CONF.SECURITYGROUP.firewall_driver or hybrid_plug_required = (not cfg.CONF.SECURITYGROUP.firewall_driver or