Merge "Fix issues with timeout and if a domain exists"

designate/backend/impl_dynect.py

@@ -45,7 +45,7 @@ OPTS = [
     cfg.IntOpt('job_timeout', default=30,
                help="Timeout in seconds for pulling a job in DynECT."),
     cfg.IntOpt('timeout', help="Timeout in seconds for API Requests.",
-               default=3),
+               default=10),
     cfg.BoolOpt('timings', help="Measure requests timings.", default=False)
 ]
 
@@ -123,7 +123,7 @@ class DynClient(object):
     def __init__(self, customer_name, user_name, password,
                  endpoint="https://api.dynect.net:443",
                  api_version='3.5.6', headers=None, verify=True, retries=1,
-                 timeout=3, timings=False, pool_maxsize=10,
+                 timeout=10, timings=False, pool_maxsize=10,
                  pool_connections=10):
         self.customer_name = customer_name
         self.user_name = user_name
@@ -348,7 +348,17 @@ class DynECTBackend(base.Backend):
             data['tsig_key_name'] = cfg.CONF[GROUP].tsig_key_name
 
         client = self.get_client()
-        client.post(url, data=data)
+
+        try:
+            client.post(url, data=data)
+        except DynClientError as e:
+            msg = _LI(
+                "Domain already exists, updating existing domain instead %s")
+            LOG.info(msg % domain['name'])
+            for emsg in e.msgs:
+                if emsg['ERR_CD'] == 'TARGET_EXISTS':
+                    client.put(url, data=data)
+
         client.put(url, data={'activate': True})
         client.logout()