Revision a4c589d2
| b/qa/ganeti-qa.py | ||
|---|---|---|
| 379 | 379 |
""" |
| 380 | 380 |
RunTestIf("network", qa_network.TestNetworkAddRemove)
|
| 381 | 381 |
RunTestIf("network", qa_network.TestNetworkConnect)
|
| 382 |
RunTestIf(["network", "tags"], qa_network.TestNetworkTags) |
|
| 382 | 383 |
|
| 383 | 384 |
|
| 384 | 385 |
def RunGroupRwTests(): |
| b/qa/qa_network.py | ||
|---|---|---|
| 24 | 24 |
""" |
| 25 | 25 |
|
| 26 | 26 |
import qa_config |
| 27 |
import qa_tags |
|
| 27 | 28 |
import qa_utils |
| 28 | 29 |
|
| 29 | 30 |
from qa_utils import AssertCommand |
| ... | ... | |
| 56 | 57 |
AssertCommand(["gnt-network", "remove", network2]) |
| 57 | 58 |
|
| 58 | 59 |
|
| 60 |
def TestNetworkTags(): |
|
| 61 |
"""gnt-network tags""" |
|
| 62 |
(network, ) = GetNonexistentNetworks(1) |
|
| 63 |
AssertCommand(["gnt-network", "add", "--network", "192.0.2.0/30", network]) |
|
| 64 |
qa_tags.TestNetworkTags(network) |
|
| 65 |
AssertCommand(["gnt-network", "remove", network]) |
|
| 66 |
|
|
| 67 |
|
|
| 59 | 68 |
def TestNetworkConnect(): |
| 60 | 69 |
"""gnt-network connect/disconnect""" |
| 61 | 70 |
(group1, ) = qa_utils.GetNonexistentGroups(1) |
| b/qa/qa_rapi.py | ||
|---|---|---|
| 457 | 457 |
uri = "/2/instances/%s/tags" % name |
| 458 | 458 |
elif kind == constants.TAG_NODEGROUP: |
| 459 | 459 |
uri = "/2/groups/%s/tags" % name |
| 460 |
elif kind == constants.TAG_NETWORK: |
|
| 461 |
uri = "/2/networks/%s/tags" % name |
|
| 460 | 462 |
else: |
| 461 | 463 |
raise errors.ProgrammerError("Unknown tag kind")
|
| 462 | 464 |
|
| b/qa/qa_tags.py | ||
|---|---|---|
| 38 | 38 |
constants.TAG_NODE: "gnt-node", |
| 39 | 39 |
constants.TAG_INSTANCE: "gnt-instance", |
| 40 | 40 |
constants.TAG_NODEGROUP: "gnt-group", |
| 41 |
constants.TAG_NETWORK: "gnt-network", |
|
| 41 | 42 |
} |
| 42 | 43 |
|
| 43 | 44 |
|
| ... | ... | |
| 83 | 84 |
def TestInstanceTags(instance): |
| 84 | 85 |
"""gnt-instance tags""" |
| 85 | 86 |
_TestTags(constants.TAG_INSTANCE, instance.name) |
| 87 |
|
|
| 88 |
|
|
| 89 |
def TestNetworkTags(network): |
|
| 90 |
"""gnt-network tags""" |
|
| 91 |
_TestTags(constants.TAG_NETWORK, network) |
|
Also available in: Unified diff