Re: [PATCH master 06/15] QA for --ipolicy-xxx-specs and show-command

[Bernardo Dal Seno]

Trivial update after the change in the previous patch:

diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 5c525a6..8cbba15 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -692,7 +692,7 @@ def TestClusterModifyISpecs():

     # Get the ipolicy command
     mnode = qa_config.GetMasterNode()
-    initcmd = GetCommandOutput(mnode.primary, "gnt-cluster show-command")
+    initcmd = GetCommandOutput(mnode.primary, "gnt-cluster show-ispecs-cmd")
     modcmd = ["gnt-cluster", "modify"]
     opts = initcmd.split()
     assert opts[0:2] == ["gnt-cluster", "init"]
@@ -702,7 +702,7 @@ def TestClusterModifyISpecs():
         modcmd.extend(opts[k:k + 2])
     # Re-apply the ipolicy (this should be a no-op)
     AssertCommand(modcmd)
-    new_initcmd = GetCommandOutput(mnode.primary, "gnt-cluster show-command")
+    new_initcmd = GetCommandOutput(mnode.primary, "gnt-cluster show-ispecs-cmd"
     AssertEqual(initcmd, new_initcmd)


diff --git a/qa/qa_group.py b/qa/qa_group.py
index b789739..b1e1680 100644
--- a/qa/qa_group.py
+++ b/qa/qa_group.py
@@ -87,7 +87,7 @@ def _TestGroupModifyISpecs(groupname):
   # Get the ipolicy command (from the cluster config)
   mnode = qa_config.GetMasterNode()
   addcmd = GetCommandOutput(mnode.primary, utils.ShellQuoteArgs([
-    "gnt-group", "show-command", "--include-defaults", groupname,
+    "gnt-group", "show-ispecs-cmd", "--include-defaults", groupname,
     ]))
   modcmd = ["gnt-group", "modify"]
   opts = addcmd.split()
@@ -100,7 +100,7 @@ def _TestGroupModifyISpecs(groupname):
   # Apply the ipolicy to the group and verify the result
   AssertCommand(modcmd)
   new_addcmd = GetCommandOutput(mnode.primary, utils.ShellQuoteArgs([
-    "gnt-group", "show-command", groupname,
+    "gnt-group", "show-ispecs-cmd", groupname,
     ]))
   AssertEqual(addcmd, new_addcmd)


Also, the option name in the patch title is changed too.

Bernardo