Merge branch 'development' of git://github.com/nberezin/f5-common-python into nberezin-development

Author: caphrim007

f5/bigip/cm/system.py

@@ -49,18 +49,33 @@ def __init__(self, authn):
 class Tmos_s(Collection):
     def __init__(self, providers):
         super(Tmos_s, self).__init__(providers)
-        self._meta_data['required_json_kind'] = 'cm:system:authn:providers:tmos:mcpremoteprovidercollectionstate'
+        if (self._meta_data['bigip']._meta_data['tmos_version'] < '13.1.0'):
+            # Starting from bigip v13.1.0 tmos resources 'kind' was changed
+            # from 'mcpremoteproviderstate' to 'authproviderstate'
+            # and tmos collection 'kind'
+            # from 'mcpremoteprovidercollectionstate' to 'mcpremoteproviderstate"
+            self._meta_data['required_json_kind'] = 'cm:system:authn:providers:tmos:mcpremoteprovidercollectionstate'
+            self._meta_data['attribute_registry'] = {
+                'cm:system:authn:providers:tmos:mcpremoteproviderstate': Tmos
+            }
+        else:
+            self._meta_data['required_json_kind'] = 'cm:system:authn:providers:tmos:authprovidercollectionstate'
+            self._meta_data['attribute_registry'] = {
+                'cm:system:authn:providers:tmos:authproviderstate': Tmos
+            }
         self._meta_data['allowed_lazy_attributes'] = [Tmos]
-        self._meta_data['attribute_registry'] = {
-            'cm:system:authn:providers:tmos:mcpremoteproviderstate': Tmos
-        }
 
 
 class Tmos(Resource):
     def __init__(self, tokens):
         super(Tmos, self).__init__(tokens)
-        self._meta_data['required_json_kind'] = 'cm:system:authn:providers:tmos:mcpremoteproviderstate'
-        self._meta_data['required_load_parameters'] = set(('id',))
+        if (self._meta_data['bigip']._meta_data['tmos_version'] < '13.1.0'):
+            # Starting from bigip v13.1.0 tmos resource 'kind' was changed
+            # from 'mcpremoteproviderstate' to 'authproviderstate'
+            self._meta_data['required_json_kind'] = 'cm:system:authn:providers:tmos:mcpremoteproviderstate'
+        else:
+            self._meta_data['required_json_kind'] = 'ccm:system:authn:providers:tmos:authproviderstate'
+            self._meta_data['required_load_parameters'] = set(('id',))
 
     def create(self, **kwargs):
         raise UnsupportedMethod(

f5/bigip/shared/authz.py

@@ -27,7 +27,8 @@ class Authz(OrganizingCollection):
     def __init__(self, shared):
         super(Authz, self).__init__(shared)
         self._meta_data['allowed_lazy_attributes'] = [
-            Tokens_s
+            Tokens_s,
+            Users_s
         ]
 
 
@@ -41,6 +42,16 @@ def __init__(self, authz):
         }
 
 
+class Users_s(Collection):
+    def __init__(self, authz):
+        super(Users_s, self).__init__(authz)
+        self._meta_data['required_json_kind'] = 'shared:authz:users:userscollectionstate'
+        self._meta_data['allowed_lazy_attributes'] = [User]
+        self._meta_data['attribute_registry'] = {
+            'shared:authz:tokens:usersworkerstate': User
+        }
+
+
 class Token(Resource):
     def __init__(self, tokens):
         super(Token, self).__init__(tokens)
@@ -82,3 +93,10 @@ def _validate_timeout(self, **kwargs):
             raise ConstraintError(
                 "The provided timeout must be a number between 1 and 36000."
             )
+
+
+class User(Resource):
+    def __init__(self, users):
+        super(User, self).__init__(users)
+        self._meta_data['required_json_kind'] = 'shared:authz:users:usersworkerstate'
+        self._meta_data['required_creation_parameters'] = {'name', 'password'}

f5/bigip/shared/test/functional/test_authz.py

@@ -17,8 +17,10 @@
 import pytest
 
 from distutils.version import LooseVersion
+from f5.sdk_exception import MissingRequiredCreationParameter
 from requests.exceptions import HTTPError
 
+
 pytestmark = pytest.mark.skipif(
     LooseVersion(pytest.config.getoption('--release'))
     < LooseVersion('12.0.0'),
@@ -45,6 +47,14 @@ def token(mgmt_root, users_link):
     resource.delete()
 
 
+@pytest.fixture(scope='function')
+def user(mgmt_root):
+    collection = mgmt_root.shared.authz.users_s
+    resource = collection.user.create(name='user12345', password='f5pass12345')
+    yield resource
+    resource.delete()
+
+
 class TestAuthz(object):
     def test_create(self, token):
         assert token.kind == 'shared:authz:tokens:authtokenitemstate'
@@ -73,3 +83,28 @@ def test_package_mgmt_tasks_collection(self, mgmt_root, token):
         col = mgmt_root.shared.authz.tokens_s.get_collection()
         assert isinstance(col, list)
         assert len(col) > 0
+
+    def test_user_create(self, user):
+        assert user.kind == 'shared:authz:users:usersworkerstate'
+
+    def test_user_modify_password(self, mgmt_root, user):
+        collection = mgmt_root.shared.authz.users_s
+        resource = collection.user.load(name='user12345')
+        if LooseVersion(pytest.config.getoption('--release')) > LooseVersion('12.1.0'):
+            # In 12.x.x there were no 'encryptedPassword' parameter
+            # on the response to shared/authz/users/user
+            oldPasswd = resource.encryptedPassword
+            resource.modify(name='user12345', password='f5site02')
+            newPasswd = resource.encryptedPassword
+            assert oldPasswd != newPasswd
+        else:
+            # In case of 12.x.x versions just make sure modify is not raising
+            # any exceptions and the user still exists after modification
+            resource.modify(name='user12345', password='f5site02')
+            exists = collection.user.exists(name='user12345')
+            assert exists is True
+
+    def test_user_create_no_password(self, mgmt_root):
+        with pytest.raises(MissingRequiredCreationParameter):
+            collection = mgmt_root.shared.authz.users_s
+            collection.user.create(name='user12345')

f5/bigip/shared/test/unit/test_authz.py

@@ -14,6 +14,7 @@
 #
 
 from f5.bigip.shared.authz import Token
+from f5.bigip.shared.authz import User
 from f5.sdk_exception import ConstraintError
 from f5.sdk_exception import MissingRequiredCreationParameter
 
@@ -28,6 +29,13 @@ def FakeToken():
     return resource
 
 
+@pytest.fixture
+def FakeUser():
+    mo = mock.MagicMock()
+    resource = User(mo)
+    return resource
+
+
 class TestToken(object):
     def test_invalid_timeout_non_number_value(self, FakeToken):
         with pytest.raises(ConstraintError):
@@ -40,3 +48,9 @@ def test_invalid_timeout_number_value(self, FakeToken):
     def test_create_no_args(self, FakeToken):
         with pytest.raises(MissingRequiredCreationParameter):
             FakeToken.create()
+
+
+class TestUser(object):
+    def test_create_user_no_args(self, FakeUser):
+        with pytest.raises(MissingRequiredCreationParameter):
+            FakeUser.create()