Schema change so the nisnetgroup triples work properly.

If we use cn for hostname there is no easy way to distinguish between
a host and a hostgroup. So adding a fqdn attribute to be used to store
the hostname instead.

3 files changed, 37 insertions, 37 deletions

diff --git a/tests/test_xmlrpc/test_host_plugin.py b/tests/test_xmlrpc/test_host_plugin.py
index 11676d08..6af53834 100644
--- a/tests/test_xmlrpc/test_host_plugin.py
+++ b/tests/test_xmlrpc/test_host_plugin.py
@@ -31,10 +31,10 @@ class test_Host(XMLRPC_test):
     """
     Test the `f_host` plugin.
     """
-    cn = u'ipatesthost.%s' % api.env.domain
+    fqdn = u'ipatesthost.%s' % api.env.domain
     description = u'Test host'
     localityname = u'Undisclosed location'
-    kw={'cn': cn, 'description': description, 'localityname': localityname}
+    kw={'fqdn': fqdn, 'description': description, 'localityname': localityname}
 
     def test_add(self):
         """
@@ -43,52 +43,52 @@ class test_Host(XMLRPC_test):
         res = api.Command['host_add'](**self.kw)
         assert type(res) is dict
         assert res['description'] == self.description
-        assert res['cn'] == self.cn
+        assert res['fqdn'] == self.fqdn
         assert res['l'] == self.localityname
 
     def test_doshow_all(self):
         """
         Test the `xmlrpc.host_show` method with all attributes.
         """
-        kw={'cn':self.cn, 'all': True}
+        kw={'fqdn':self.fqdn, 'all': True}
         res = api.Command['host_show'](**kw)
         assert res
         assert res.get('description','') == self.description
-        assert res.get('cn','') == self.cn
+        assert res.get('fqdn','') == self.fqdn
         assert res.get('l','') == self.localityname
 
     def test_doshow_minimal(self):
         """
         Test the `xmlrpc.host_show` method with default attributes.
         """
-        kw={'cn':self.cn}
+        kw={'fqdn':self.fqdn}
         res = api.Command['host_show'](**kw)
         assert res
         assert res.get('description','') == self.description
-        assert res.get('cn','') == self.cn
+        assert res.get('fqdn','') == self.fqdn
         assert res.get('localityname','') == self.localityname
 
     def test_find_all(self):
         """
         Test the `xmlrpc.host_find` method with all attributes.
         """
-        kw={'cn':self.cn, 'all': True}
+        kw={'fqdn':self.fqdn, 'all': True}
         res = api.Command['host_find'](**kw)
         assert res
         assert len(res) == 2
         assert res[1].get('description','') == self.description
-        assert res[1].get('cn','') == self.cn
+        assert res[1].get('fqdn','') == self.fqdn
         assert res[1].get('l','') == self.localityname
 
     def test_find_minimal(self):
         """
         Test the `xmlrpc.host_find` method with default attributes.
         """
-        res = api.Command['host_find'](self.cn)
+        res = api.Command['host_find'](self.fqdn)
         assert res
         assert len(res) == 2
         assert res[1].get('description','') == self.description
-        assert res[1].get('cn','') == self.cn
+        assert res[1].get('fqdn','') == self.fqdn
         assert res[1].get('localityname','') == self.localityname
 
     def test_mod(self):
@@ -96,27 +96,27 @@ class test_Host(XMLRPC_test):
         Test the `xmlrpc.host_mod` method.
         """
         newdesc = u'Updated host'
-        modkw={'cn': self.cn, 'description': newdesc}
+        modkw={'fqdn': self.fqdn, 'description': newdesc}
         res = api.Command['host_mod'](**modkw)
         assert res
         assert res.get('description','') == newdesc
 
         # Ok, double-check that it was changed
-        res = api.Command['host_show'](self.cn)
+        res = api.Command['host_show'](self.fqdn)
         assert res
         assert res.get('description','') == newdesc
-        assert res.get('cn','') == self.cn
+        assert res.get('fqdn','') == self.fqdn
 
     def test_remove(self):
         """
         Test the `xmlrpc.host_del` method.
         """
-        res = api.Command['host_del'](self.cn)
+        res = api.Command['host_del'](self.fqdn)
         assert res == True
 
         # Verify that it is gone
         try:
-            res = api.Command['host_show'](self.cn)
+            res = api.Command['host_show'](self.fqdn)
         except errors.NotFound:
             pass
         else:
diff --git a/tests/test_xmlrpc/test_hostgroup_plugin.py b/tests/test_xmlrpc/test_hostgroup_plugin.py
index 34aea672..23e1c6b8 100644
--- a/tests/test_xmlrpc/test_hostgroup_plugin.py
+++ b/tests/test_xmlrpc/test_hostgroup_plugin.py
@@ -35,7 +35,7 @@ class test_Host(XMLRPC_test):
     description=u'Test host group'
     kw={'cn': cn, 'description': description}
 
-    host_cn = u'ipatesthost.%s' % api.env.domain
+    host_fqdn = u'ipatesthost.%s' % api.env.domain
     host_description = u'Test host'
     host_localityname = u'Undisclosed location'
 
@@ -52,18 +52,18 @@ class test_Host(XMLRPC_test):
         """
         Add a host to test add/remove member.
         """
-        kw={'cn': self.host_cn, 'description': self.host_description, 'localityname': self.host_localityname}
+        kw={'fqdn': self.host_fqdn, 'description': self.host_description, 'localityname': self.host_localityname}
         res = api.Command['host_add'](**kw)
         assert res
         assert res.get('description','') == self.host_description
-        assert res.get('cn','') == self.host_cn
+        assert res.get('fqdn','') == self.host_fqdn
 
     def test_addmember(self):
         """
         Test the `xmlrpc.hostgroup_add_member` method.
         """
         kw={}
-        kw['hosts'] = self.host_cn
+        kw['hosts'] = self.host_fqdn
         res = api.Command['hostgroup_add_member'](self.cn, **kw)
         assert res == tuple()
 
@@ -75,7 +75,7 @@ class test_Host(XMLRPC_test):
         assert res
         assert res.get('description','') == self.description
         assert res.get('cn','') == self.cn
-        assert res.get('member','').startswith('cn=%s' % self.host_cn)
+        assert res.get('member','').startswith('fqdn=%s' % self.host_fqdn)
 
     def test_find(self):
         """
@@ -86,7 +86,7 @@ class test_Host(XMLRPC_test):
         assert len(res) == 2, res
         assert res[1].get('description','') == self.description
         assert res[1].get('cn','') == self.cn
-        assert res[1].get('member','').startswith('cn=%s' % self.host_cn)
+        assert res[1].get('member','').startswith('fqdn=%s' % self.host_fqdn)
 
     def test_mod(self):
         """
@@ -109,7 +109,7 @@ class test_Host(XMLRPC_test):
         Test the `xmlrpc.hostgroup_remove_member` method.
         """
         kw={}
-        kw['hosts'] = self.host_cn
+        kw['hosts'] = self.host_fqdn
         res = api.Command['hostgroup_remove_member'](self.cn, **kw)
         assert res == tuple()
 
@@ -132,12 +132,12 @@ class test_Host(XMLRPC_test):
         """
         Test the `xmlrpc.host_del` method.
         """
-        res = api.Command['host_del'](self.host_cn)
+        res = api.Command['host_del'](self.host_fqdn)
         assert res == True
 
         # Verify that it is gone
         try:
-            res = api.Command['host_show'](self.host_cn)
+            res = api.Command['host_show'](self.host_fqdn)
         except errors.NotFound:
             pass
         else:
diff --git a/tests/test_xmlrpc/test_netgroup_plugin.py b/tests/test_xmlrpc/test_netgroup_plugin.py
index 84986fa5..e5de2557 100644
--- a/tests/test_xmlrpc/test_netgroup_plugin.py
+++ b/tests/test_xmlrpc/test_netgroup_plugin.py
@@ -45,10 +45,10 @@ class test_Netgroup(XMLRPC_test):
     ng_description=u'Netgroup'
     ng_kw={'cn': ng_cn, 'description': ng_description, 'nisdomainname': u'example.com'}
 
-    host_cn = u'ipatesthost.%s' % api.env.domain
+    host_fqdn = u'ipatesthost.%s' % api.env.domain
     host_description=u'Test host'
     host_localityname=u'Undisclosed location'
-    host_kw={'cn': host_cn, 'description': host_description, 'localityname': host_localityname}
+    host_kw={'fqdn': host_fqdn, 'description': host_description, 'localityname': host_localityname}
 
     hg_cn=u'ng1'
     hg_description=u'Netgroup'
@@ -82,7 +82,7 @@ class test_Netgroup(XMLRPC_test):
         res = api.Command['host_add'](**self.host_kw)
         assert res
         assert res.get('description','') == self.host_description
-        assert res.get('cn','') == self.host_cn
+        assert res.get('fqdn','') == self.host_fqdn
 
         # Add a hostgroup
         res = api.Command['hostgroup_add'](**self.hg_kw)
@@ -107,7 +107,7 @@ class test_Netgroup(XMLRPC_test):
         Test the `xmlrpc.netgroup_add_member` method.
         """
         kw={}
-        kw['hosts'] = self.host_cn
+        kw['hosts'] = self.host_fqdn
         res = api.Command['netgroup_add_member'](self.ng_cn, **kw)
         assert res == tuple()
 
@@ -131,9 +131,9 @@ class test_Netgroup(XMLRPC_test):
         Test the `xmlrpc.netgroup_add_member` method again to test dupes.
         """
         kw={}
-        kw['hosts'] = self.host_cn
+        kw['hosts'] = self.host_fqdn
         res = api.Command['netgroup_add_member'](self.ng_cn, **kw)
-        assert is_member_of(res, 'cn=%s' % self.host_cn)
+        assert is_member_of(res, 'fqdn=%s' % self.host_fqdn)
 
         kw={}
         kw['hostgroups'] = self.hg_cn
@@ -170,7 +170,7 @@ class test_Netgroup(XMLRPC_test):
         assert res
         assert res.get('description','') == self.ng_description
         assert res.get('cn','') == self.ng_cn
-        assert is_member_of(res.get('memberhost',[]), 'cn=%s' % self.host_cn)
+        assert is_member_of(res.get('memberhost',[]), 'fqdn=%s' % self.host_fqdn)
         assert is_member_of(res.get('memberhost',[]), 'cn=%s' % self.hg_cn)
         assert is_member_of(res.get('memberuser',[]), 'uid=%s' % self.user_uid)
         assert is_member_of(res.get('memberuser',[]), 'cn=%s' % self.group_cn)
@@ -206,7 +206,7 @@ class test_Netgroup(XMLRPC_test):
         Test the `xmlrpc.hostgroup_remove_member` method.
         """
         kw={}
-        kw['hosts'] = self.host_cn
+        kw['hosts'] = self.host_fqdn
         res = api.Command['netgroup_remove_member'](self.ng_cn, **kw)
         assert res == tuple()
 
@@ -230,9 +230,9 @@ class test_Netgroup(XMLRPC_test):
         Test the `xmlrpc.netgroup_remove_member` method again to test not found.
         """
         kw={}
-        kw['hosts'] = self.host_cn
+        kw['hosts'] = self.host_fqdn
         res = api.Command['netgroup_remove_member'](self.ng_cn, **kw)
-        assert is_member_of(res, 'cn=%s' % self.host_cn)
+        assert is_member_of(res, 'fqdn=%s' % self.host_fqdn)
 
         kw={}
         kw['hostgroups'] = self.hg_cn
@@ -269,12 +269,12 @@ class test_Netgroup(XMLRPC_test):
         Remove the test data we added
         """
         # Remove the host
-        res = api.Command['host_del'](self.host_cn)
+        res = api.Command['host_del'](self.host_fqdn)
         assert res == True
 
         # Verify that it is gone
         try:
-            res = api.Command['host_show'](self.host_cn)
+            res = api.Command['host_show'](self.host_fqdn)
         except errors.NotFound:
             pass
         else: