Set default admin password for endpoints

2gis · Mar 21, 2017 · 1d1f707 · 1d1f707
1 parent c634487
commit 1d1f707
Show file tree

Hide file tree

Showing 15 changed files with 239 additions and 267 deletions.
diff --git a/config_template.py b/config_template.py
@@ -46,9 +46,9 @@ class Config(object):
     OPENSTACK_PING_RETRY_COUNT = 3
     OPENSTACK_DEFAULT_FLAVOR = ''
     OPENASTACK_VM_META_DATA = {
-        'admin_pass': 'testPassw0rd.',
-        'adminPass': 'testPassw0rd.'
+        'admin_pass': 'testPassw0rd.'
     }
+    OPENSTACK_VM_USERDATA_FILE_PATH = "%s/userdata" % os.path.abspath(os.curdir)
 
     VM_CREATE_CHECK_PAUSE = 5
     VM_CREATE_CHECK_ATTEMPTS = 1000
@@ -64,4 +64,3 @@ class Config(object):
     VMMASTER_AGENT_PORT = 9000
 
     THREAD_POOL_MAX = 100
-
diff --git a/core/constants.py b/core/constants.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-
-
 SESSION_CLOSE_REASON_API_CALL = "Session closed via API stop_session call"
 GET_ENDPOINT_ATTEMPTS = 10
 GET_ENDPOINT_WAIT_TIME_INCREMENT = 5
-
 ENDPOINT_REBUILD_ATTEMPTS = 3
 REQUEST_TIMEOUT = 120
diff --git a/core/exceptions.py b/core/exceptions.py
@@ -11,14 +11,6 @@ class SessionException(Exception):
     pass
 
 
-class ClonesException(Exception):
-    pass
-
-
-class NoMacError(Exception):
-    pass
-
-
 class CreationException(Exception):
     pass
 
@@ -37,11 +29,3 @@ class TimeoutException(Exception):
 
 class ConnectionError(Exception):
     pass
-
-
-class NoSuchEndpoint(Exception):
-    pass
-
-
-class QueueItemNotFound(Exception):
-    pass
diff --git a/core/sessions.py b/core/sessions.py
@@ -118,6 +118,8 @@ def save_artifacts(self):
         artifacts = {
             "selenium_server": "/var/log/selenium_server.log"
         }
+        if not self.endpoint_ip:
+            return False
         return self.endpoint.save_artifacts(self, artifacts)
 
     def close(self, reason=None):
@@ -219,8 +221,7 @@ def req():
 
         response = q.get()
         if isinstance(response, requests.Timeout):
-            raise RequestTimeoutException("No response for '%s' in %s sec. Original: %s"
-                                          % (url, timeout, response))
+            raise RequestTimeoutException("No response for '%s' in %s sec. Original: %s" % (url, timeout, response))
         if isinstance(response, Exception):
             raise RequestException("Error for '%s'. Original: %s" % (url, response))
 

diff --git a/tests/run_unittests.py b/tests/run_unittests.py
diff --git a/tests/unit/data/config_openstack.py b/tests/unit/data/config_openstack.py
@@ -41,6 +41,7 @@ class Config(object):
     OPENASTACK_VM_META_DATA = {
         'admin_pass': 'testPassw0rd.'
     }
+    OPENSTACK_VM_USERDATA_FILE_PATH = "%s/tests/unit/data/userdata" % os.path.abspath(os.curdir)
 
     VM_CHECK = False
     VM_CHECK_FREQUENCY = 1800

diff --git a/tests/unit/data/userdata b/tests/unit/data/userdata
@@ -0,0 +1,3 @@
+#cloud-config
+password: pass
+chpasswd: {expire: False}
diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
@@ -285,4 +285,4 @@ def delete(self):
             body = json.loads(response.data)
             self.assertEqual(200, body['metacode'])
             self.assertEqual("This endpoints were deleted from pool: "
-                             "[%s]" % vm_name_1, body['result'])
+                             "%s" % [vm_name_1], body['result'])