port-id and net-id subkeys of nics argument should be mutually exclusive

[Pavlo Shchelokovskyy]

Currently when specifying --nics argument to nova boot it is possible to provide both port-id and net-id, although judging from nova code [1] and [2] the port-id will always take precedence, making net-id redundant in presence of port-id. The code in client also checks that at least one of them provided, but perfectly allows both to be provided. Docs for this argument are also a bit confusing as they say that each one is required in the absence of the other, but nothing on using both of them together.

We should make those keys really mutually exclusive and update help strings to reflect that.

[1] https://github.com/openstack/nova/blob/master/nova/api/openstack/compute/servers.py#L673
[2] https://github.com/openstack/nova/blob/master/nova/api/openstack/compute/plugins/v3/servers.py#L331

[Openstack Gerrit (openstack-gerrit)]

Fix proposed to branch: master
Review: https://review.openstack.org/91085

[Openstack Gerrit (openstack-gerrit)]

Fix proposed to branch: master
Review: https://review.openstack.org/91086

[Openstack Gerrit (openstack-gerrit)]

Reviewed: https://review.openstack.org/91085
Committed: https://git.openstack.org/cgit/openstack/python-troveclient/commit/?id=b03152810dfe9b4b881b8789a82c8521e8cb372f
Submitter: Jenkins
Branch: master

commit b03152810dfe9b4b881b8789a82c8521e8cb372f
Author: Pavlo Shchelokovskyy <email address hidden>
Date: Tue Apr 29 18:52:23 2014 +0300

    Make port-id and net-id keys mutually exclusive

    These keys are never used together, and port-id always takes precedence
    in Nova API when present. This patch makes these parameters mutually
    exclusive and updates help strings accordingly.

    Change-Id: I61170291468757b47b043bd81f022704dd38e3d0
    Closes-Bug: #1314097

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/91086
Committed: https://git.openstack.org/cgit/openstack/python-novaclient/commit/?id=9f6679ebd3c7436989b03b81c52b908657363a72
Submitter: Jenkins
Branch: master

commit 9f6679ebd3c7436989b03b81c52b908657363a72
Author: Pavlo Shchelokovskyy <email address hidden>
Date: Tue Apr 29 18:56:04 2014 +0300

    Make port-id and net-id keys mutually exclusive

    These keys are never used together, and port-id always takes precedence
    in Nova API when present. This patch makes these parameters mutually
    exclusive and updates help strings accordingly.

    Change-Id: I207dc637cb69d9ab3ff6024a657d2c1890057b4d
    Closes-Bug: #1314097