Issue #484 - Separated encrypted model unit test from password test

Author: rakillen

core/src/test/python/alias_encrypted_model_test.py

@@ -0,0 +1,77 @@
+"""
+Copyright (c) 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+"""
+import unittest
+
+from wlsdeploy.aliases.aliases import Aliases
+from wlsdeploy.aliases.location_context import LocationContext
+from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
+from wlsdeploy.aliases.model_constants import JDBC_RESOURCE
+from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
+from wlsdeploy.aliases.model_constants import PASSWORD_ENCRYPTED
+from wlsdeploy.aliases.wlst_modes import WlstModes
+from wlsdeploy.logging.platform_logger import PlatformLogger
+from wlsdeploy.util.cla_utils import CommandLineArgUtil
+from wlsdeploy.util.model_context import ModelContext
+
+
+class AliasEncryptedModelTestCase(unittest.TestCase):
+    """
+    Test cases for a the -use_encryption feature.
+    """
+
+    _logger = PlatformLogger('wlsdeploy.aliases')
+    _wls_version = '12.2.1.3'
+    _wlst_password_name = "Password"
+    _wlst_password_encrypted_name = "PasswordEncrypted"
+
+    _passphrase = 'RE a drop of golden sun'
+    _password = 'welcome1'
+    _encrypted_password = '{AES}UC9rZld3blZFUnMraW12cHkydmtmdmpSZmNNMWVHajA6VERPYlJoeWxXU09IaHVrQzpBeWsrd2ZacVkyVT0='
+
+    def setUp(self):
+        # construct aliases as if the -use_encryption and -passphrase switches were used
+        model_context = ModelContext("test", {CommandLineArgUtil.USE_ENCRYPTION_SWITCH: 'true',
+                                              CommandLineArgUtil.PASSPHRASE_SWITCH: self._passphrase})
+        self.aliases = Aliases(model_context, wlst_mode=WlstModes.OFFLINE, wls_version=self._wls_version)
+        self.online_aliases = Aliases(model_context, wlst_mode=WlstModes.ONLINE, wls_version=self._wls_version)
+
+        self.location = LocationContext()
+        self.location.append_location(JDBC_SYSTEM_RESOURCE)
+        self.location.add_name_token(self.aliases.get_name_token(self.location), "Mine")
+        self.location.append_location(JDBC_RESOURCE)
+        self.location.append_location(JDBC_DRIVER_PARAMS)
+
+    def testOfflineWlstNames(self):
+        # Using offline WLST, the PasswordEncrypted model attribute should translate to the PasswordEncrypted WLST
+        # attribute, regardless of whether the password is encrypted. The password value should be plain text.
+
+        # using encrypted password
+        wlst_name, wlst_value = \
+            self.aliases.get_wlst_attribute_name_and_value(self.location, PASSWORD_ENCRYPTED, self._encrypted_password)
+        self.assertEqual(wlst_name, self._wlst_password_encrypted_name)
+        self.assertEqual(wlst_value, self._password)
+
+        # using unencrypted password
+        wlst_name, wlst_value = \
+            self.aliases.get_wlst_attribute_name_and_value(self.location, PASSWORD_ENCRYPTED, self._password)
+        self.assertEquals(wlst_name, self._wlst_password_encrypted_name)
+        self.assertEqual(wlst_value, self._password)
+
+    def testOnlineWlstNames(self):
+        # Using online WLST, the PasswordEncrypted model attribute should always translate to the Password WLST
+        # attribute, and the value should translate to the unencrypted value.
+
+        # using encrypted password
+        wlst_name, wlst_value = \
+            self.online_aliases.get_wlst_attribute_name_and_value(self.location, PASSWORD_ENCRYPTED,
+                                                                  self._encrypted_password)
+        self.assertEqual(wlst_name, self._wlst_password_name)
+        self.assertEqual(wlst_value, self._password)
+
+        # using unencrypted password
+        wlst_name, wlst_value = \
+            self.online_aliases.get_wlst_attribute_name_and_value(self.location, PASSWORD_ENCRYPTED, self._password)
+        self.assertEquals(wlst_name, self._wlst_password_name)
+        self.assertEqual(wlst_value, self._password)

core/src/test/python/alias_password_test.py

@@ -2,7 +2,6 @@
 Copyright (c) 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
-import jarray
 import unittest
 
 from wlsdeploy.aliases.aliases import Aliases
@@ -13,25 +12,24 @@
 from wlsdeploy.aliases.model_constants import PASSWORD_ENCRYPTED
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.logging.platform_logger import PlatformLogger
-from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model_context import ModelContext
 
 
 class AliasPasswordTestCase(unittest.TestCase):
+    """
+    Test domain-encrypted passwords in a model.
+    """
 
     _logger = PlatformLogger('wlsdeploy.aliases')
     _wls_version = '12.2.1.3'
     _wlst_password_name = "Password"
     _wlst_password_encrypted_name = "PasswordEncrypted"
 
-    _passphrase = 'RE a drop of golden sun'
     _password = 'welcome1'
     _encrypted_password = '{AES}UC9rZld3blZFUnMraW12cHkydmtmdmpSZmNNMWVHajA6VERPYlJoeWxXU09IaHVrQzpBeWsrd2ZacVkyVT0='
-    _encrypted_password_bytes = jarray.array(_encrypted_password, 'b')
 
     def setUp(self):
-        model_context = ModelContext("test", {CommandLineArgUtil.USE_ENCRYPTION_SWITCH: 'true',
-                                              CommandLineArgUtil.PASSPHRASE_SWITCH: self._passphrase})
+        model_context = ModelContext("test", {})
         self.aliases = Aliases(model_context, wlst_mode=WlstModes.OFFLINE, wls_version=self._wls_version)
         self.online_aliases = Aliases(model_context, wlst_mode=WlstModes.ONLINE, wls_version=self._wls_version)
 
@@ -73,7 +71,7 @@ def testOfflineWlstNames(self):
         wlst_name, wlst_value = \
             self.aliases.get_wlst_attribute_name_and_value(self.location, PASSWORD_ENCRYPTED, self._encrypted_password)
         self.assertEqual(wlst_name, self._wlst_password_encrypted_name)
-        self.assertEqual(wlst_value, self._password)
+        self.assertEqual(wlst_value, self._encrypted_password)
 
         # using unencrypted password
         wlst_name, wlst_value = \
@@ -89,7 +87,7 @@ def testOnlineWlstNames(self):
             self.online_aliases.get_wlst_attribute_name_and_value(self.location, PASSWORD_ENCRYPTED,
                                                                   self._encrypted_password)
         self.assertEqual(wlst_name, self._wlst_password_encrypted_name)
-        self.assertEqual(wlst_value, self._password)
+        self.assertEqual(wlst_value, self._encrypted_password)
 
         # using unencrypted password
         wlst_name, wlst_value = \