Skip to content

Commit

Permalink
Merge "Remove traffic class option --tc from qosmap.py . This will be…
Browse files Browse the repository at this point in the history
… handled in vrouter qosmap utility." into R3.2
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Dec 1, 2016
2 parents e27f23f + 8db010d commit 8ba01a4
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/vnsw/agent/contrail/qosmap.py
Expand Up @@ -14,7 +14,7 @@ def __init__(self, conf_file):
self.conf_file = conf_file
self._parse_args()
qos_cmd = '/usr/bin/qosmap --set-queue ' + self.ifname + ' --dcbx ' + self.dcbx
qos_cmd = qos_cmd + ' --bw ' + self.bandwidth + ' --strict ' + self.scheduling + ' --tc ' + self.traffic_class
qos_cmd = qos_cmd + ' --bw ' + self.bandwidth + ' --strict ' + self.scheduling
self.execute_command(qos_cmd)

# end __init__
Expand All @@ -27,7 +27,6 @@ def _parse_args(self):
self.priority_group = []
self.bandwidth = []
self.scheduling = []
self.traffic_class = []
scheduling = ""
bandwidth = ""
config = ConfigParser.SafeConfigParser()
Expand All @@ -51,12 +50,11 @@ def _parse_args(self):
bandwidth = config.get(section, 'bandwidth')
self.bandwidth[int(priority_id)] = bandwidth

self.priority_group = [elem for elem in self.priority_group if elem != '0']
self.traffic_class = ",".join(self.priority_group)
self.priority_group = [elem for elem in self.priority_group]
self.bandwidth = ",".join(self.bandwidth)
self.scheduling = "".join(self.scheduling)
if (self.traffic_class == ""):
print "Please configure qos parameters"
if (self.priority_group == ""):
print "Please configure priority groups"

# end _parse_args

Expand Down

0 comments on commit 8ba01a4

Please sign in to comment.