x/vmware-nsx
Code Issues Proposed changes

Integrate QoS constants change

Browse Source 
patch I4f10ef3c1cbaa2a868de2b8e3abc4c39eb1f44c7 broke our code

Change-Id: Ib24866e9e2f4d3f0412cc2e793ecb4711cb10732
This commit is contained in:
Adit Sarfaty 2016-07-13 08:22:08 +03:00
parent ad425b90b1
commit ffacfe0b24
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -152,7 +152,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
"router_availability_zone"] "router_availability_zone"]
supported_qos_rule_types = [qos_consts.RULE_TYPE_BANDWIDTH_LIMIT, supported_qos_rule_types = [qos_consts.RULE_TYPE_BANDWIDTH_LIMIT,
qos_consts.RULE_TYPE_DSCP_MARK] qos_consts.RULE_TYPE_DSCP_MARKING]
__native_bulk_support = True __native_bulk_support = True
__native_pagination_support = True __native_pagination_support = True

2
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -142,7 +142,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
"security-group-logging"] "security-group-logging"]
supported_qos_rule_types = [qos_consts.RULE_TYPE_BANDWIDTH_LIMIT, supported_qos_rule_types = [qos_consts.RULE_TYPE_BANDWIDTH_LIMIT,
qos_consts.RULE_TYPE_DSCP_MARK] qos_consts.RULE_TYPE_DSCP_MARKING]
@resource_registry.tracked_resources( @resource_registry.tracked_resources(
network=models_v2.Network, network=models_v2.Network,

2
vmware_nsx/services/qos/nsx_v/utils.py
View File

@ -80,7 +80,7 @@ class NsxVQosRule(object):
self.peakBandwidth = self.averageBandwidth self.peakBandwidth = self.averageBandwidth
# burstSize: kbps (neutron) -> Bytes (nsxv) # burstSize: kbps (neutron) -> Bytes (nsxv)
self.burstSize = rule_obj['max_burst_kbps'] * 128 self.burstSize = rule_obj['max_burst_kbps'] * 128
if rule_obj['type'] == qos_consts.RULE_TYPE_DSCP_MARK: if rule_obj['type'] == qos_consts.RULE_TYPE_DSCP_MARKING:
self.dscpMarkEnabled = True self.dscpMarkEnabled = True
self.dscpMarkValue = rule_obj['dscp_mark'] self.dscpMarkValue = rule_obj['dscp_mark']

2
vmware_nsx/tests/unit/services/qos/test_nsxv_notification.py
View File

@ -80,7 +80,7 @@ class TestQosNsxVNotification(test_plugin.NsxVPluginV2TestCase,
'dscp_marking_rule': { 'dscp_marking_rule': {
'id': uuidutils.generate_uuid(), 'id': uuidutils.generate_uuid(),
'dscp_mark': 22, 'dscp_mark': 22,
'type': qos_consts.RULE_TYPE_DSCP_MARK}} 'type': qos_consts.RULE_TYPE_DSCP_MARKING}}
self.policy = policy_object.QosPolicy( self.policy = policy_object.QosPolicy(
self.ctxt, **self.policy_data['policy']) self.ctxt, **self.policy_data['policy'])