[Qos-Fab]: Provisioning of default queue HW queue should not mandate logical queue

[Pulkit Tandon]

While configuring agent.conf for qos queue configurations, if we don't add a logical_queue value for a default queue, it fails.

We should not mandate a logical_queue value for default queue.
The statement need to be executed conditionally. Something like following :

if 'logical_queue' in default_nic_queue.keys():
        qos_logical_queue.append(str(default_nic_queue['logical_queue']).strip('[]').replace(" ",""))

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/25993
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/25994
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/25995
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/25992
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/25992
Committed: http://github.org/Juniper/contrail-fabric-utils/commit/9d2b41619d6d7b6c9c0c81549de1b57d673512a6
Submitter: Zuul
Branch: master

commit 9d2b41619d6d7b6c9c0c81549de1b57d673512a6
Author: Kumar Harsh <email address hidden>
Date: Fri Nov 11 14:02:39 2016 +0530

Make default hardware queue configuration as optional.

Closes-Bug:#1640056

Change-Id: Idb4652f2d9fa55568fe83e443226d7b8dae865a5

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/25993
Committed: http://github.org/Juniper/contrail-provisioning/commit/f2b1403f71a8d93f8bf93592014b27e4df56a261
Submitter: Zuul
Branch: master

commit f2b1403f71a8d93f8bf93592014b27e4df56a261
Author: Kumar Harsh <email address hidden>
Date: Fri Nov 11 14:04:00 2016 +0530

Make default hardware queue as optional for qos configuration.

Change-Id: I68a9d2cac1da8fd363f5dac54c3ea1f1ec3cc21a
Closes-Bug: #1640056

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/25994
Committed: http://github.org/Juniper/contrail-provisioning/commit/28a70c1d4e5b3b9512eb0583e366a7b5947667e5
Submitter: Zuul
Branch: R3.2

commit 28a70c1d4e5b3b9512eb0583e366a7b5947667e5
Author: Kumar Harsh <email address hidden>
Date: Fri Nov 11 14:04:00 2016 +0530

Make default hardware queue as optional for qos configuration.

Closes-Bug: #1640056

Change-Id: I68a9d2cac1da8fd363f5dac54c3ea1f1ec3cc21a

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/25995
Committed: http://github.org/Juniper/contrail-fabric-utils/commit/f744289d1e8c54a98e6d07f34cf5237bd4bc7341
Submitter: Zuul
Branch: R3.2

commit f744289d1e8c54a98e6d07f34cf5237bd4bc7341
Author: Kumar Harsh <email address hidden>
Date: Fri Nov 11 14:02:39 2016 +0530

Make default hardware queue configuration as optional.

Closes-Bug: #1640056

Change-Id: Idb4652f2d9fa55568fe83e443226d7b8dae865a5

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/26369
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/26370
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/26382
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/26383
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/26370
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/26382
Submitter: Kumar Harsh (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/26369
Committed: http://github.org/Juniper/contrail-fabric-utils/commit/443f57c7bc5a9e2287502cc480dbbeecf799b74d
Submitter: Zuul
Branch: master

commit 443f57c7bc5a9e2287502cc480dbbeecf799b74d
Author: Kumar Harsh <email address hidden>
Date: Tue Nov 22 15:38:44 2016 +0530

Do not mandate a logical_queue value for default queue.

Change-Id: I5b10101fb9e3f9ea17e7a1887093fd41c7457db3
Closes-Bug: #1640056

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/26370
Committed: http://github.org/Juniper/contrail-provisioning/commit/fe4f0f2e444a696bde461ed5718258ed4b9c1736
Submitter: Zuul
Branch: master

commit fe4f0f2e444a696bde461ed5718258ed4b9c1736
Author: Kumar Harsh <email address hidden>
Date: Thu Nov 24 07:33:21 2016 +0530

Provisioning changes for not mandating logical_queue value for default queue.

Closes-Bug: #1640056

Change-Id: I7ff26e591fff8e3fee1270174fde98f0730bdc10

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/26383
Committed: http://github.org/Juniper/contrail-fabric-utils/commit/5cdee230b91617914905ac55d7cfdfc2825a2322
Submitter: Zuul (<email address hidden>)
Branch: R3.2

commit 5cdee230b91617914905ac55d7cfdfc2825a2322
Author: Kumar Harsh <email address hidden>
Date: Tue Nov 22 15:38:44 2016 +0530

Do not mandate a logical_queue value for default queue.

Change-Id: I5b10101fb9e3f9ea17e7a1887093fd41c7457db3
Closes-Bug: #1640056

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/26382
Committed: http://github.org/Juniper/contrail-provisioning/commit/21c27881a290f8fdbab280bb78ecd233ba2d7d5c
Submitter: Zuul (<email address hidden>)
Branch: R3.2

commit 21c27881a290f8fdbab280bb78ecd233ba2d7d5c
Author: Kumar Harsh <email address hidden>
Date: Thu Nov 24 07:40:15 2016 +0530

Provisioning changes for not mandating logical_queue value for default queue.

Closes-Bug: #1640056

Change-Id: I7ff26e591fff8e3fee1270174fde98f0730bdc10

[Pulkit Tandon (pulkitt)]

Tetse don R3.2 - Build 9.
This issue if fixed if its case of fresh provisioning(Contrail Provisioning.)

But, if we run fab utility "fab setup_qos", this issue is still present.

root@nodeh4:~/fabric-utils# fab setup_qos
[root@10.204.217.128] Executing task 'setup_qos'
2016-12-12 11:58:30:984651: Traceback (most recent call last):
2016-12-12 11:58:30:984938: File "/usr/local/lib/python2.7/dist-packages/fabric/main.py", line 743, in main
2016-12-12 11:58:30:984986: *args, **kwargs
2016-12-12 11:58:31:001341: File "/usr/local/lib/python2.7/dist-packages/fabric/tasks.py", line 375, in execute
2016-12-12 11:58:31:001392: multiprocessing
2016-12-12 11:58:31:001695: File "/usr/local/lib/python2.7/dist-packages/fabric/tasks.py", line 271, in _execute
2016-12-12 11:58:31:001723: return task.run(*args, **kwargs)
2016-12-12 11:58:31:001802: File "/usr/local/lib/python2.7/dist-packages/fabric/tasks.py", line 171, in run
2016-12-12 11:58:31:001827: return self.wrapped(*args, **kwargs)
2016-12-12 11:58:31:001890: File "/usr/local/lib/python2.7/dist-packages/fabric/decorators.py", line 53, in inner_decorator
2016-12-12 11:58:31:001914: return func(*args, **kwargs)
2016-12-12 11:58:31:002133: File "/root/fabric-utils/fabfile/tasks/provision.py", line 1366, in setup_qos
2016-12-12 11:58:31:002159: execute("setup_qos_node", env.host_string)
2016-12-12 11:58:31:002422: File "/usr/local/lib/python2.7/dist-packages/fabric/tasks.py", line 415, in execute
2016-12-12 11:58:31:002447: results['<local-only>'] = task.run(*args, **new_kwargs)
2016-12-12 11:58:31:002545: File "/usr/local/lib/python2.7/dist-packages/fabric/tasks.py", line 171, in run
2016-12-12 11:58:31:002568: return self.wrapped(*args, **kwargs)
2016-12-12 11:58:31:002631: File "/root/fabric-utils/fabfile/tasks/provision.py", line 1388, in setup_qos_node
2016-12-12 11:58:31:002654: qos_logical_queue.append(str(default_nic_queue['logical_queue']).strip('[]').replace(" ",""))
2016-12-12 11:58:31:002897: KeyError: 'logical_queue'
2016-12-12 11:58:31:002979: root@nodeh4:~/fabric-utils#

[Hari Prasad Killi (haripk)]

R3.2: https://review.opencontrail.org/#/c/26322/

[Pulkit Tandon (pulkitt)]

Tested on Build 18 - R3.2
Removed Logical queue ids from default queue.

The fresh provisioning went through
Even the fab steup_qos_queuing went through

contrail-vrouter-agnet.conf was populated correctly in both the cases.