From 850473a59993e1a75c248a9b3a83284f568a4bf2 Mon Sep 17 00:00:00 2001

From: Tomas Jelinek <tojeline@redhat.com>

Date: Fri, 8 Jul 2016 15:14:05 +0200

Subject: [PATCH] tests: use safe node names

---

 pcs/test/test_cluster.py | 466 +++++++++++++++++++++++------------------------

 1 file changed, 233 insertions(+), 233 deletions(-)

diff --git a/pcs/test/test_cluster.py b/pcs/test/test_cluster.py

index 2c3e71b..8a245a2 100644

--- a/pcs/test/test_cluster.py

+++ b/pcs/test/test_cluster.py

@@ -106,7 +106,7 @@ class ClusterTest(unittest.TestCase, AssertPcsMixin):

         self.assertTrue(output.startswith("\nUsage: pcs cluster setup..."))

         self.assertEqual(1, returnVal)

-        output, returnVal = pcs(temp_cib, "cluster setup cname rh7-1 rh7-2")

+        output, returnVal = pcs(temp_cib, "cluster setup cname rh7-1.localhost rh7-2.localhost")

         self.assertEqual(

             "Error: A cluster name (--name <name>) is required to setup a cluster\n",

             output

@@ -116,22 +116,22 @@ class ClusterTest(unittest.TestCase, AssertPcsMixin):

     def test_cluster_setup_hostnames_resolving(self):

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --corosync_conf={0} --cluster_conf={1} --name cname nonexistant-address"

+            "cluster setup --local --corosync_conf={0} --cluster_conf={1} --name cname nonexistant-address.invalid"

             .format(corosync_conf_tmp, cluster_conf_tmp)

         )

         ac(output, """\

 Error: Unable to resolve all hostnames, use --force to override

-Warning: Unable to resolve hostname: nonexistant-address

+Warning: Unable to resolve hostname: nonexistant-address.invalid

 """)

         self.assertEqual(1, returnVal)

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --corosync_conf={0} --cluster_conf={1} --name cname nonexistant-address --force"

+            "cluster setup --local --corosync_conf={0} --cluster_conf={1} --name cname nonexistant-address.invalid --force"

             .format(corosync_conf_tmp, cluster_conf_tmp)

         )

         ac(output, """\

-Warning: Unable to resolve hostname: nonexistant-address

+Warning: Unable to resolve hostname: nonexistant-address.invalid

 """)

         self.assertEqual(0, returnVal)

@@ -141,7 +141,7 @@ Warning: Unable to resolve hostname: nonexistant-address

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --corosync_conf={0} --name cname rh7-1 rh7-2"

+            "cluster setup --local --corosync_conf={0} --name cname rh7-1.localhost rh7-2.localhost"

             .format(corosync_conf_tmp)

         )

         self.assertEqual("", output)

@@ -156,12 +156,12 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

 }

@@ -183,7 +183,7 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --corosync_conf={0} --name cname rh7-2 rh7-3"

+            "cluster setup --local --corosync_conf={0} --name cname rh7-2.localhost rh7-3.localhost"

             .format(corosync_conf_tmp)

         )

         self.assertEqual("""\

@@ -198,7 +198,7 @@ Error: {0} already exists, use --force to overwrite

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --force --local --corosync_conf={0} --name cname rh7-2 rh7-3"

+            "cluster setup --force --local --corosync_conf={0} --name cname rh7-2.localhost rh7-3.localhost"

             .format(corosync_conf_tmp)

         )

         self.assertEqual("", output)

@@ -215,12 +215,12 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-3

+        ring0_addr: rh7-3.localhost

         nodeid: 2

     }

 }

@@ -243,7 +243,7 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --cluster_conf={0} --name cname rh7-1 rh7-2"

+            "cluster setup --local --cluster_conf={0} --name cname rh7-1.localhost rh7-2.localhost"

             .format(cluster_conf_tmp)

         )

         self.assertEqual("", output)

@@ -252,17 +252,17 @@ logging {

 <cluster config_version="9" name="cname">

   <fence_daemon/>

   <clusternodes>

-    <clusternode name="rh7-1" nodeid="1">

+    <clusternode name="rh7-1.localhost" nodeid="1">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-1"/>

+          <device name="pcmk-redirect" port="rh7-1.localhost"/>

         </method>

       </fence>

     </clusternode>

-    <clusternode name="rh7-2" nodeid="2">

+    <clusternode name="rh7-2.localhost" nodeid="2">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-2"/>

+          <device name="pcmk-redirect" port="rh7-2.localhost"/>

         </method>

       </fence>

     </clusternode>

@@ -283,7 +283,7 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --cluster_conf={0} --name cname rh7-2 rh7-3"

+            "cluster setup --local --cluster_conf={0} --name cname rh7-2.localhost rh7-3.localhost"

             .format(cluster_conf_tmp)

         )

         self.assertEqual("""\

@@ -298,7 +298,7 @@ Error: {0} already exists, use --force to overwrite

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --force --local --cluster_conf={0} --name cname rh7-2 rh7-3"

+            "cluster setup --force --local --cluster_conf={0} --name cname rh7-2.localhost rh7-3.localhost"

             .format(cluster_conf_tmp)

         )

         self.assertEqual("", output)

@@ -309,17 +309,17 @@ Error: {0} already exists, use --force to overwrite

 <cluster config_version="9" name="cname">

   <fence_daemon/>

   <clusternodes>

-    <clusternode name="rh7-2" nodeid="1">

+    <clusternode name="rh7-2.localhost" nodeid="1">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-2"/>

+          <device name="pcmk-redirect" port="rh7-2.localhost"/>

         </method>

       </fence>

     </clusternode>

-    <clusternode name="rh7-3" nodeid="2">

+    <clusternode name="rh7-3.localhost" nodeid="2">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-3"/>

+          <device name="pcmk-redirect" port="rh7-3.localhost"/>

         </method>

       </fence>

     </clusternode>

@@ -344,7 +344,7 @@ Error: {0} already exists, use --force to overwrite

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --corosync_conf={0} --name cname rh7-1 rh7-2"

+            "cluster setup --local --corosync_conf={0} --name cname rh7-1.localhost rh7-2.localhost"

             .format(corosync_conf_tmp)

         )

         self.assertEqual("", output)

@@ -361,12 +361,12 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

 }

@@ -385,10 +385,10 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode add --corosync_conf={0} rh7-3"

+            "cluster localnode add --corosync_conf={0} rh7-3.localhost"

             .format(corosync_conf_tmp)

         )

-        self.assertEqual("rh7-3: successfully added!\n", output)

+        self.assertEqual("rh7-3.localhost: successfully added!\n", output)

         self.assertEqual(0, returnVal)

         with open(corosync_conf_tmp) as f:

             data = f.read()

@@ -402,17 +402,17 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

     node {

-        ring0_addr: rh7-3

+        ring0_addr: rh7-3.localhost

         nodeid: 3

     }

 }

@@ -430,11 +430,11 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode remove --corosync_conf={0} rh7-3"

+            "cluster localnode remove --corosync_conf={0} rh7-3.localhost"

             .format(corosync_conf_tmp)

         )

         self.assertEqual(0, returnVal)

-        self.assertEqual("rh7-3: successfully removed!\n", output)

+        self.assertEqual("rh7-3.localhost: successfully removed!\n", output)

         with open(corosync_conf_tmp) as f:

             data = f.read()

             ac(data, """\

@@ -447,12 +447,12 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

 }

@@ -471,10 +471,10 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode add --corosync_conf={0} rh7-3,192.168.1.3"

+            "cluster localnode add --corosync_conf={0} rh7-3.localhost,192.168.1.3"

             .format(corosync_conf_tmp)

         )

-        self.assertEqual("rh7-3,192.168.1.3: successfully added!\n", output)

+        self.assertEqual("rh7-3.localhost,192.168.1.3: successfully added!\n", output)

         self.assertEqual(0, returnVal)

         with open(corosync_conf_tmp) as f:

             data = f.read()

@@ -488,17 +488,17 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

     node {

-        ring0_addr: rh7-3

+        ring0_addr: rh7-3.localhost

         ring1_addr: 192.168.1.3

         nodeid: 3

     }

@@ -517,11 +517,11 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode remove --corosync_conf={0} rh7-2"

+            "cluster localnode remove --corosync_conf={0} rh7-2.localhost"

             .format(corosync_conf_tmp)

         )

         self.assertEqual(0, returnVal)

-        self.assertEqual("rh7-2: successfully removed!\n", output)

+        self.assertEqual("rh7-2.localhost: successfully removed!\n", output)

         with open(corosync_conf_tmp) as f:

             data = f.read()

             ac(data, """\

@@ -534,12 +534,12 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-3

+        ring0_addr: rh7-3.localhost

         ring1_addr: 192.168.1.3

         nodeid: 3

     }

@@ -559,11 +559,11 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode remove --corosync_conf={0} rh7-3,192.168.1.3"

+            "cluster localnode remove --corosync_conf={0} rh7-3.localhost,192.168.1.3"

             .format(corosync_conf_tmp)

         )

         self.assertEqual(0, returnVal)

-        self.assertEqual("rh7-3,192.168.1.3: successfully removed!\n", output)

+        self.assertEqual("rh7-3.localhost,192.168.1.3: successfully removed!\n", output)

         with open(corosync_conf_tmp) as f:

             data = f.read()

             ac(data, """\

@@ -576,7 +576,7 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

 }

@@ -601,7 +601,7 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --corosync_conf={0} --name cname rh7-1 rh7-2 --auto_tie_breaker=1"

+            "cluster setup --local --corosync_conf={0} --name cname rh7-1.localhost rh7-2.localhost --auto_tie_breaker=1"

             .format(corosync_conf_tmp)

         )

         self.assertEqual("", output)

@@ -618,12 +618,12 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

 }

@@ -642,10 +642,10 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode add --corosync_conf={0} rh7-3"

+            "cluster localnode add --corosync_conf={0} rh7-3.localhost"

             .format(corosync_conf_tmp)

         )

-        self.assertEqual(output, "rh7-3: successfully added!\n")

+        self.assertEqual(output, "rh7-3.localhost: successfully added!\n")

         self.assertEqual(0, returnVal)

         with open(corosync_conf_tmp) as f:

             data = f.read()

@@ -659,17 +659,17 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

     node {

-        ring0_addr: rh7-3

+        ring0_addr: rh7-3.localhost

         nodeid: 3

     }

 }

@@ -688,10 +688,10 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode remove --corosync_conf={0} rh7-3"

+            "cluster localnode remove --corosync_conf={0} rh7-3.localhost"

             .format(corosync_conf_tmp)

         )

-        self.assertEqual("rh7-3: successfully removed!\n", output)

+        self.assertEqual("rh7-3.localhost: successfully removed!\n", output)

         self.assertEqual(0, returnVal)

         with open(corosync_conf_tmp) as f:

             data = f.read()

@@ -705,12 +705,12 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

 }

@@ -734,7 +734,7 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --corosync_conf={0} --name cname rh7-1 rh7-2 rh7-3"

+            "cluster setup --local --corosync_conf={0} --name cname rh7-1.localhost rh7-2.localhost rh7-3.localhost"

             .format(corosync_conf_tmp)

         )

         self.assertEqual("", output)

@@ -751,17 +751,17 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

     node {

-        ring0_addr: rh7-3

+        ring0_addr: rh7-3.localhost

         nodeid: 3

     }

 }

@@ -784,7 +784,7 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --corosync_conf={0} --name cname rh7-1 rh7-2 --transport udp"

+            "cluster setup --local --corosync_conf={0} --name cname rh7-1.localhost rh7-2.localhost --transport udp"

             .format(corosync_conf_tmp)

         )

         self.assertEqual("", output)

@@ -801,12 +801,12 @@ totem {

 nodelist {

     node {

-        ring0_addr: rh7-1

+        ring0_addr: rh7-1.localhost

         nodeid: 1

     }

     node {

-        ring0_addr: rh7-2

+        ring0_addr: rh7-2.localhost

         nodeid: 2

     }

 }

@@ -834,7 +834,7 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --cluster_conf={0} --name cname rh7-1 rh7-2"

+            "cluster setup --local --cluster_conf={0} --name cname rh7-1.localhost rh7-2.localhost"

             .format(cluster_conf_tmp)

         )

         ac(output, "")

@@ -845,17 +845,17 @@ logging {

 <cluster config_version="9" name="cname">

   <fence_daemon/>

   <clusternodes>

-    <clusternode name="rh7-1" nodeid="1">

+    <clusternode name="rh7-1.localhost" nodeid="1">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-1"/>

+          <device name="pcmk-redirect" port="rh7-1.localhost"/>

         </method>

       </fence>

     </clusternode>

-    <clusternode name="rh7-2" nodeid="2">

+    <clusternode name="rh7-2.localhost" nodeid="2">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-2"/>

+          <device name="pcmk-redirect" port="rh7-2.localhost"/>

         </method>

       </fence>

     </clusternode>

@@ -873,10 +873,10 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode add --cluster_conf={0} rh7-3"

+            "cluster localnode add --cluster_conf={0} rh7-3.localhost"

             .format(cluster_conf_tmp)

         )

-        ac(output, "rh7-3: successfully added!\n")

+        ac(output, "rh7-3.localhost: successfully added!\n")

         self.assertEqual(returnVal, 0)

         with open(cluster_conf_tmp) as f:

             data = f.read()

@@ -884,24 +884,24 @@ logging {

 <cluster config_version="13" name="cname">

   <fence_daemon/>

   <clusternodes>

-    <clusternode name="rh7-1" nodeid="1">

+    <clusternode name="rh7-1.localhost" nodeid="1">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-1"/>

+          <device name="pcmk-redirect" port="rh7-1.localhost"/>

         </method>

       </fence>

     </clusternode>

-    <clusternode name="rh7-2" nodeid="2">

+    <clusternode name="rh7-2.localhost" nodeid="2">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-2"/>

+          <device name="pcmk-redirect" port="rh7-2.localhost"/>

         </method>

       </fence>

     </clusternode>

-    <clusternode name="rh7-3" nodeid="3">

+    <clusternode name="rh7-3.localhost" nodeid="3">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-3"/>

+          <device name="pcmk-redirect" port="rh7-3.localhost"/>

         </method>

       </fence>

     </clusternode>

@@ -919,10 +919,10 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode remove --cluster_conf={0} rh7-3"

+            "cluster localnode remove --cluster_conf={0} rh7-3.localhost"

             .format(cluster_conf_tmp)

         )

-        ac(output, "rh7-3: successfully removed!\n")

+        ac(output, "rh7-3.localhost: successfully removed!\n")

         self.assertEqual(returnVal, 0)

         with open(cluster_conf_tmp) as f:

@@ -931,17 +931,17 @@ logging {

 <cluster config_version="15" name="cname">

   <fence_daemon/>

   <clusternodes>

-    <clusternode name="rh7-1" nodeid="1">

+    <clusternode name="rh7-1.localhost" nodeid="1">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-1"/>

+          <device name="pcmk-redirect" port="rh7-1.localhost"/>

         </method>

       </fence>

     </clusternode>

-    <clusternode name="rh7-2" nodeid="2">

+    <clusternode name="rh7-2.localhost" nodeid="2">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-2"/>

+          <device name="pcmk-redirect" port="rh7-2.localhost"/>

         </method>

       </fence>

     </clusternode>

@@ -959,10 +959,10 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode add --cluster_conf={0} rh7-3,192.168.1.3"

+            "cluster localnode add --cluster_conf={0} rh7-3.localhost,192.168.1.3"

             .format(cluster_conf_tmp)

         )

-        ac(output, "rh7-3,192.168.1.3: successfully added!\n")

+        ac(output, "rh7-3.localhost,192.168.1.3: successfully added!\n")

         self.assertEqual(returnVal, 0)

         with open(cluster_conf_tmp) as f:

@@ -971,25 +971,25 @@ logging {

 <cluster config_version="20" name="cname">

   <fence_daemon/>

   <clusternodes>

-    <clusternode name="rh7-1" nodeid="1">

+    <clusternode name="rh7-1.localhost" nodeid="1">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-1"/>

+          <device name="pcmk-redirect" port="rh7-1.localhost"/>

         </method>

       </fence>

     </clusternode>

-    <clusternode name="rh7-2" nodeid="2">

+    <clusternode name="rh7-2.localhost" nodeid="2">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-2"/>

+          <device name="pcmk-redirect" port="rh7-2.localhost"/>

         </method>

       </fence>

     </clusternode>

-    <clusternode name="rh7-3" nodeid="3">

+    <clusternode name="rh7-3.localhost" nodeid="3">

       <altname name="192.168.1.3"/>

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-3"/>

+          <device name="pcmk-redirect" port="rh7-3.localhost"/>

         </method>

       </fence>

     </clusternode>

@@ -1007,10 +1007,10 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode remove --cluster_conf={0} rh7-2"

+            "cluster localnode remove --cluster_conf={0} rh7-2.localhost"

             .format(cluster_conf_tmp)

         )

-        ac(output, "rh7-2: successfully removed!\n")

+        ac(output, "rh7-2.localhost: successfully removed!\n")

         self.assertEqual(returnVal, 0)

         with open(cluster_conf_tmp) as f:

@@ -1019,18 +1019,18 @@ logging {

 <cluster config_version="22" name="cname">

   <fence_daemon/>

   <clusternodes>

-    <clusternode name="rh7-1" nodeid="1">

+    <clusternode name="rh7-1.localhost" nodeid="1">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-1"/>

+          <device name="pcmk-redirect" port="rh7-1.localhost"/>

         </method>

       </fence>

     </clusternode>

-    <clusternode name="rh7-3" nodeid="3">

+    <clusternode name="rh7-3.localhost" nodeid="3">

       <altname name="192.168.1.3"/>

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-3"/>

+          <device name="pcmk-redirect" port="rh7-3.localhost"/>

         </method>

       </fence>

     </clusternode>

@@ -1048,10 +1048,10 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster localnode remove --cluster_conf={0} rh7-3,192.168.1.3"

+            "cluster localnode remove --cluster_conf={0} rh7-3.localhost,192.168.1.3"

             .format(cluster_conf_tmp)

         )

-        ac(output, "rh7-3,192.168.1.3: successfully removed!\n")

+        ac(output, "rh7-3.localhost,192.168.1.3: successfully removed!\n")

         self.assertEqual(returnVal, 0)

         with open(cluster_conf_tmp) as f:

@@ -1060,10 +1060,10 @@ logging {

 <cluster config_version="23" name="cname">

   <fence_daemon/>

   <clusternodes>

-    <clusternode name="rh7-1" nodeid="1">

+    <clusternode name="rh7-1.localhost" nodeid="1">

       <fence>

         <method name="pcmk-method">

-          <device name="pcmk-redirect" port="rh7-1"/>

+          <device name="pcmk-redirect" port="rh7-1.localhost"/>

         </method>

       </fence>

     </clusternode>

@@ -1086,7 +1086,7 @@ logging {

         output, returnVal = pcs(

             temp_cib,

-            "cluster setup --local --cluster_conf={0} --name cname rh7-1 rh7-2 rh7-3"

+            "cluster setup --local --cluster_conf={0} --name cname rh7-1.localhost rh7-2.localhost rh7-3.localhost"

             .format(cluster_conf_tmp)

         )

         ac(output, "")

@@ -1097,24 +1097,24 @@ logging {

 <cluster config_version="12" name="cname">

   <fence_daemon/>