dns: rackspace: Leverage common host naming code

Drop RackspaceDNSDriver._to_partial_record_name() and
RackspaceDNSDriver._to_full_record_name() in favor of the common
support provided by the Record and Zone classes.

Author: Aaron Sierra

libcloud/dns/drivers/rackspace.py

@@ -292,7 +292,7 @@ def create_record(self, name, zone, type, data, extra=None):
         # name is "bar.foo.com"
         extra = extra if extra else {}
 
-        name = self._to_full_record_name(domain=zone.domain, name=name)
+        name = zone.hostname(name)
         data = {"name": name, "type": self.RECORD_TYPE_MAP[type], "data": data}
 
         if "ttl" in extra:
@@ -314,8 +314,7 @@ def update_record(self, record, name=None, type=None, data=None, extra=None):
         # attribute must always be present.
         extra = extra if extra else {}
 
-        name = self._to_full_record_name(domain=record.zone.domain, name=record.name)
-        payload = {"name": name}
+        payload = {"name": record.hostname}
 
         if data:
             payload["data"] = data
@@ -552,7 +551,6 @@ def _to_zone(self, data):
     def _to_record(self, data, zone):
         id = data["id"]
         fqdn = data["name"]
-        name = self._to_partial_record_name(domain=zone.domain, name=fqdn)
         type = self._string_to_record_type(data["type"])
         record_data = data["data"]
         extra = {"fqdn": fqdn}
@@ -563,7 +561,7 @@ def _to_record(self, data, zone):
 
         record = Record(
             id=str(id),
-            name=name,
+            name=fqdn,
             type=type,
             data=record_data,
             zone=zone,
@@ -586,42 +584,6 @@ def _to_ptr_record(self, data, link):
         record = RackspacePTRRecord(id=str(id), ip=ip, domain=domain, driver=self, extra=extra)
         return record
 
-    def _to_full_record_name(self, domain, name):
-        """
-        Build a FQDN from a domain and record name.
-
-        :param domain: Domain name.
-        :type domain: ``str``
-
-        :param name: Record name.
-        :type name: ``str``
-        """
-        if name:
-            name = "{}.{}".format(name, domain)
-        else:
-            name = domain
-
-        return name
-
-    def _to_partial_record_name(self, domain, name):
-        """
-        Remove domain portion from the record name.
-
-        :param domain: Domain name.
-        :type domain: ``str``
-
-        :param name: Full record name (fqdn).
-        :type name: ``str``
-        """
-        if name == domain:
-            # Map "root" record names to None to be consistent with other
-            # drivers
-            return None
-
-        # Strip domain portion
-        name = name.replace(".%s" % (domain), "")
-        return name
-
     def _ex_connection_class_kwargs(self):
         kwargs = self.openstack_connection_kwargs()
         kwargs["region"] = self.region

libcloud/test/dns/test_rackspace.py

@@ -400,30 +400,6 @@ def test_delete_record_does_not_exist(self):
         else:
             self.fail("Exception was not thrown")
 
-    def test_to_full_record_name_name_provided(self):
-        domain = "foo.bar"
-        name = "test"
-        self.assertEqual(self.driver._to_full_record_name(domain, name), "test.foo.bar")
-
-    def test_to_full_record_name_name_not_provided(self):
-        domain = "foo.bar"
-        name = None
-        self.assertEqual(self.driver._to_full_record_name(domain, name), "foo.bar")
-
-    def test_to_partial_record_name(self):
-        domain = "example.com"
-        names = [
-            "test.example.com",
-            "foo.bar.example.com",
-            "example.com.example.com",
-            "example.com",
-        ]
-        expected_values = ["test", "foo.bar", "example.com", None]
-
-        for name, expected_value in zip(names, expected_values):
-            value = self.driver._to_partial_record_name(domain=domain, name=name)
-            self.assertEqual(value, expected_value)
-
     def test_ex_create_ptr_success(self):
         ip = "127.1.1.1"
         domain = "www.foo4.bar.com"