Merge pull request #627 from zancas/feature.stats_293

Feature.stats 293

Author: pjbreaux

f5/bigip/__init__.py

@@ -71,10 +71,6 @@ def hostname(self):
     def icontrol_version(self):
         return self._meta_data['icontrol_version']
 
-    @property
-    def tmos_version(self):
-        return self._meta_data['tmos_version']
-
     def _get_tmos_version(self):
         connect = self._meta_data['bigip']._meta_data['icr_session']
         base_uri = self._meta_data['uri'] + 'tm/sys/'

f5/bigip/mixins.py

@@ -114,7 +114,7 @@ def __getattr__(container, name):
                 return attribute
 
     def _check_supported_versions(self, container, attribute):
-        tmos_v = container._meta_data['bigip'].tmos_version
+        tmos_v = container._meta_data['bigip']._meta_data['tmos_version']
         minimum = attribute._meta_data['minimum_version']
         if LooseVersion(tmos_v) < LooseVersion(minimum):
             error = "There was an attempt to access resource: \n{}\n which " \

f5/bigip/resource.py

@@ -364,22 +364,6 @@ class ResourceBase(PathElement, ToDictMixin):
     that represents objects in a hierarchical relationship similar to the
     device's uri path hierarchy.
     """
-    def __init__(self, container):
-        """Call this with containing_object_instance.FOO
-
-        Where FOO is a concrete subclass of this class, ResourceBase.  The '.'
-        operator passes "FOO" to the __getattr__ method of the
-        containing_object_instance which instantiates it as the appropriate
-        sub-type of ResourceBase.
-
-        Since all ResourceBases sub-types must support the `refresh` method, it
-        is defined here, in the base class.
-        NOTE: The BIG-IP® uri 'mgmt/tm/' uniquely passes itself to this
-        constructor as the "container".
-
-        :param container: instance is an attribute of a ResourceBase container
-        """
-        super(ResourceBase, self).__init__(container)
 
     def _modify(self, **patch):
         """Wrapped with modify, override in a subclass to customize."""
@@ -634,12 +618,6 @@ class OrganizingCollection(ResourceBase):
     * provide a list of dictionaries that contain uri's to other
       resources on the device.
     """
-    def __init__(self, container):
-        """Call this to construct an OC. It should be an attribute of BIG-IP®.
-
-        :param bigip: all OCs are attributes of a BIG-IP® instance
-        """
-        super(OrganizingCollection, self).__init__(container)
 
     def get_collection(self, **kwargs):
         """Call to obtain a list of the reference dicts in the instance `items`
@@ -665,20 +643,6 @@ class Collection(ResourceBase):
         unless it ends in ``s`` then it must have ``_s``.
 
     """
-    def __init__(self, container):
-        """Call this with the __get_attr__ of a Resource or OC.
-
-        The contained-by-an-OC-or-Resource pattern is observed, and not a
-        strictly enforced part of the model.
-
-        URIs are constructed _from_ Collection subclass names.  All Collection
-        subclass names MUST end in 's' or '_s', to distinguish them from their
-        associated Resource (which is always accessible as an attribute of the
-        subclass instance.
-
-        :param container: instances of Collection are attributes of container
-        """
-        super(Collection, self).__init__(container)
 
     def get_collection(self, **kwargs):
         """Get an iterator of Python ``Resource`` objects that represent URIs.
@@ -807,6 +771,7 @@ def _activate_URI(self, selfLinkuri):
         # attrs local alias
         attribute_reg = self._meta_data.get('attribute_registry', {})
         attrs = attribute_reg.values()
+        attrs.append(Stats)
 
         (scheme, domain, path, qarg, frag) = urlparse.urlsplit(selfLinkuri)
         path_uri = urlparse.urlunsplit((scheme, uri.netloc, path, '', ''))
@@ -1035,3 +1000,20 @@ def load(self, **kwargs):
         newinst = self._stamp_out_core()
         newinst._refresh(**kwargs)
         return newinst
+
+
+class Stats(UnnamedResource):
+    '''For stats resources.'''
+
+    def modify(self, **kwargs):
+        '''Modify is not supported for unnamed resources
+
+        :raises: UnsupportedOperation
+        '''
+        raise UnsupportedMethod(
+            "%s does not support the modify method" % self.__class__.__name__
+        )
+
+    def load(self, **kwargs):
+        # TODO(pjbreaux) add try-except and custom exception here.
+        return super(Stats, self).load(**kwargs)

f5/bigip/test/test_resource.py

@@ -34,10 +34,12 @@
 from f5.bigip.resource import RequestParamKwargCollision
 from f5.bigip.resource import Resource
 from f5.bigip.resource import ResourceBase
+from f5.bigip.resource import Stats
 from f5.bigip.resource import UnnamedResource
 from f5.bigip.resource import UnregisteredKind
 from f5.bigip.resource import URICreationCollision
 from f5.bigip.tm.cm.sync_status import Sync_Status
+from f5.bigip.tm.ltm.virtual import Profiles_s
 from f5.bigip.tm.ltm.virtual import Virtual
 from f5.sdk_exception import UnsupportedMethod
 
@@ -99,8 +101,8 @@ def test_Resource__local_update_IncompatibleKeys():
         " it's not a valid Python 2.7 identifier."
 
 
-def test_Resource__local_update():
-    r = Resource(mock.MagicMock())
+def test_Resource__local_update(fake_vs):
+    r = fake_vs
     stash = r._meta_data.copy()
     r._local_update({'test': 1})
     assert stash == r._meta_data
@@ -207,7 +209,7 @@ def test__activate_URI():
     assert r._meta_data['creation_uri_qargs'] ==\
         {'a': ['b'], 'ver': ['11.5']}
     assert r._meta_data['creation_uri_frag'] == 'FOO'
-    assert r._meta_data['allowed_lazy_attributes'] == [u"SPAM"]
+    assert r._meta_data['allowed_lazy_attributes'] == [u"SPAM", Stats]
 
 
 def test__create_with_Collision():
@@ -757,3 +759,57 @@ def test_load(self):
         r.generation = 0
         x = r.load(partition='Common', name='test_load')
         assert x.selfLink == 'https://localhost:443/mgmt/tm/cm/sync-status'
+
+
+class TestStats(object):
+    def test_create_raises(self):
+        stats_resource = Stats(mock.MagicMock())
+        with pytest.raises(UnsupportedMethod):
+            stats_resource.create()
+
+    def test_delete_raises(self):
+        stats_resource = Stats(mock.MagicMock())
+        with pytest.raises(UnsupportedMethod):
+            stats_resource.delete()
+
+    def test_modify_raises(self):
+        stats_resource = Stats(mock.MagicMock())
+        with pytest.raises(UnsupportedMethod):
+            stats_resource.modify()
+
+    def test_load(self):
+        r = Virtual(mock.MagicMock())
+        r._meta_data['allowed_lazy_attributes'] = []
+        attrs = {'get.side_effect':
+                 [MockResponse(
+                     {
+                         u"generation": 0,
+                         u"selfLink": "https://localhost:443/mgmt/tm/ltm/"
+                         "virtual",
+                         u"kind": u"tm:ltm:virtual:virtualstate"
+                     }),
+                  MockResponse(
+                     {
+                         u"generation": 0,
+                         u"selfLink": u'https://localhost/mgmt/tm/ltm/virtual/'
+                         '~Common~modtest1/stats?ver=11.6.0',
+                         u"kind": u"tm:ltm:virtual:virtualstats"
+                     })
+                  ]}
+        mock_session = mock.MagicMock(**attrs)
+        r._meta_data['bigip']._meta_data =\
+            {'icr_session': mock_session,
+             'hostname': 'TESTDOMAINNAME',
+             'uri': 'https://TESTDOMAIN:443/mgmt/tm/',
+             'tmos_version': '11.5.0',
+             'minimum_version': '11.5.0'}
+        r.generation = 0
+        x = r.load(partition='Common', name='test_load')
+        assert x.selfLink == 'https://localhost:443/mgmt/tm/ltm/virtual'
+        assert x._meta_data['allowed_lazy_attributes'] == [Profiles_s, Stats]
+        statsfactory = x.stats
+        assert 'selfLink' not in statsfactory.__dict__
+        statsobj = statsfactory.load()
+        assert statsobj.selfLink ==\
+            u'https://localhost/mgmt/tm/ltm/virtual/'\
+            '~Common~modtest1/stats?ver=11.6.0'

f5/bigip/tm/sys/test/test_db.py

@@ -23,7 +23,7 @@
 def fake_dbs():
     fake_sys = mock.MagicMock()
     dbs = Dbs(fake_sys)
-    dbs._meta_data['bigip'].tmos_version = '11.6.0'
+    dbs._meta_data['bigip']._meta_data = {'tmos_version': '11.6.0'}
     return dbs
 
 

f5/bigip/tm/sys/test/test_folder.py

@@ -24,7 +24,7 @@
 def FakeFolders():
     fake_sys = mock.MagicMock()
     folders = Folders(fake_sys)
-    folders._meta_data['bigip'].tmos_version = '11.6.0'
+    folders._meta_data['bigip']._meta_data = {'tmos_version': '11.6.0'}
     return folders
 
 

f5/bigip/tm/sys/test/test_performance.py

@@ -25,7 +25,7 @@
 def FakePerformance():
     fake_sys = mock.MagicMock()
     performances = Performances(fake_sys)
-    performances._meta_data['bigip'].tmos_version = '11.6.0'
+    performances._meta_data['bigip']._meta_data = {'tmos_version': '11.6.0'}
     return performances
 
 

test/functional/tm/ltm/test_virtual.py

@@ -17,6 +17,7 @@
 
 from f5.bigip.resource import MissingRequiredCreationParameter
 from f5.bigip.resource import MissingRequiredReadParameter
+from f5.sdk_exception import UnsupportedMethod
 
 import copy
 from pprint import pprint as pp
@@ -77,6 +78,22 @@ def test_virtual_modify(self, request, mgmt_root, setup_device_snapshot):
             elif k == desc:
                 virtual1.__dict__[k] == 'Cool mod test'
 
+    def test_stats(self, request, mgmt_root, setup_device_snapshot):
+        virtual1, vc1 = setup_virtual_test(
+            request, mgmt_root, 'Common', 'modtest1'
+        )
+        stats = virtual1.stats.load()
+        pp(stats.raw)
+        assert virtual1.cmpEnabled == u'yes'
+        assert stats.entries['cmpEnabled']['description'] == u'enabled'
+        virtual1.modify(cmpEnabled=u'no')
+        stats.refresh()
+        assert stats.entries['cmpEnabled']['description'] == u'disabled'
+        with pytest.raises(UnsupportedMethod) as USMEIO:
+            stats.modify(description='foo')
+        assert USMEIO.value.message ==\
+            "Stats does not support the modify method"
+
 
 def test_profiles_CE(
         mgmt_root, opt_release, setup_device_snapshot