Prefer security file over username/password

emc-openstack · Aug 24, 2016 · ef37614 · ef37614
1 parent 8ea8c5a
commit ef37614
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/storops/vnx/navi_command.py b/storops/vnx/navi_command.py
@@ -77,12 +77,11 @@ def is_credential_valid(self):
         return self._is_credential_valid
 
     def get_credentials(self):
-        if self._username is None and self._password is None:
+        if self._sec_file is not None:
             # use security file
-            if self._sec_file is not None:
-                ret = text_var('-secfilepath', self._sec_file)
-            else:
-                ret = []
+            ret = text_var('-secfilepath', self._sec_file)
+        elif self._username is None and self._password is None:
+            ret = []
         elif self._username is None or self._password is None:
             self._is_credential_valid = False
             raise ex.VNXCredentialError('username or password missing.')