You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/02/27 00:02:50 UTC

svn commit: r1450513 - in /libcloud/trunk: ./ CHANGES libcloud/dns/drivers/rackspace.py

Author: tomaz
Date: Tue Feb 26 23:02:49 2013
New Revision: 1450513

URL: http://svn.apache.org/r1450513
Log:
Update changes.

Modified:
    libcloud/trunk/   (props changed)
    libcloud/trunk/CHANGES
    libcloud/trunk/libcloud/dns/drivers/rackspace.py

Propchange: libcloud/trunk/
------------------------------------------------------------------------------
  Merged /libcloud/branches/0.12.x:r1450512

Modified: libcloud/trunk/CHANGES
URL: http://svn.apache.org/viewvc/libcloud/trunk/CHANGES?rev=1450513&r1=1450512&r2=1450513&view=diff
==============================================================================
--- libcloud/trunk/CHANGES (original)
+++ libcloud/trunk/CHANGES Tue Feb 26 23:02:49 2013
@@ -2,6 +2,15 @@
 
 Changes with Apache Libcloud in development:
 
+  *) Compute
+
+    -  Improve public and private IP address handling in OpenStack 1.1 driver.
+       Assume every IP address which doesn't have a label "public" or "internet"
+       is private. (LIBCLOUD-297)
+       [Grischa Meyer, Tomaz Muraus]
+
+Changes with Apache Libcloud 0.12.1:
+
   *) General
 
     - Deprecate LazyList method of iteration over large paginated collections
@@ -166,11 +175,6 @@ Changes with Apache Libcloud in developm
    - Add support for OpenNebula 3.8. (LIBCLOUD-295)
      [Guillaume ZITTA]
 
-   -  Improve public and private IP address handling in OpenStack 1.1 driver.
-      Assume every IP address which doesn't have a label "public" or "internet"
-      is private. (LIBCLOUD-297)
-      [Grischa Meyer, Tomaz Muraus]
-
    - Add missing 'deletd' -> terminated mapping to OpenStack driver.
      (LIBCLOUD-276)
      [Jayyy V]

Modified: libcloud/trunk/libcloud/dns/drivers/rackspace.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/dns/drivers/rackspace.py?rev=1450513&r1=1450512&r2=1450513&view=diff
==============================================================================
--- libcloud/trunk/libcloud/dns/drivers/rackspace.py (original)
+++ libcloud/trunk/libcloud/dns/drivers/rackspace.py Tue Feb 26 23:02:49 2013
@@ -34,7 +34,7 @@ from libcloud.dns.types import ZoneDoesN
 from libcloud.dns.base import DNSDriver, Zone, Record
 
 VALID_ZONE_EXTRA_PARAMS = ['email', 'comment', 'ns1']
-VALID_RECORD_EXTRA_PARAMS = ['ttl', 'comment']
+VALID_RECORD_EXTRA_PARAMS = ['ttl', 'comment', 'priority']
 
 
 class RackspaceDNSResponse(OpenStack_1_1_Response):
@@ -240,7 +240,10 @@ class RackspaceDNSDriver(DNSDriver, Open
 
         if 'ttl' in extra:
             data['ttl'] = int(extra['ttl'])
-
+        
+        if 'priority' in extra:
+            data['priority'] = int(extra['priority']) 
+            
         payload = {'records': [data]}
         self.connection.set_context({'resource': 'zone', 'id': zone.id})
         response = self.connection.async_request(action='/domains/%s/records'
@@ -340,12 +343,10 @@ class RackspaceDNSDriver(DNSDriver, Open
         record_data = data['data']
         extra = {'fqdn': fqdn}
 
-        if 'ttl' in data:
-            extra['ttl'] = data['ttl']
-
-        if 'comment' in data:
-            extra['comment'] = data['comment']
-
+        for key in VALID_RECORD_EXTRA_PARAMS:
+            if key in data:
+                extra[key] = data[key]
+            
         record = Record(id=str(id), name=name, type=type, data=record_data,
                         zone=zone, driver=self, extra=extra)
         return record