Merge pull request #458 from caphrim007/fix-sshd-class

    Fixes the sshd api

Author: zancas

f5/bigip/tm/sys/sshd.py

@@ -28,10 +28,10 @@
 """
 
 from f5.bigip.mixins import UnnamedResourceMixin
-from f5.bigip.resource import Resource
+from f5.bigip.resource import ResourceBase
 
 
-class Sshd(UnnamedResourceMixin, Resource):
+class Sshd(UnnamedResourceMixin, ResourceBase):
     """BIG-IP® system SSHD unnamed resource
 
         .. note::

requirements.test.txt

@@ -6,3 +6,4 @@ hacking==0.10.2
 mock==1.3.0
 pytest==2.9.1
 pytest-cov>=2.2.1
+git+https://github.com/F5Networks/pytest-symbols.git

test/functional/cluster/test_cluster.py

@@ -76,6 +76,8 @@ def teardown_cluster():
     request.addfinalizer(teardown_cluster)
 
 
+@pytest.mark.skipif(pytest.config.getoption('--symbols') is None,
+                    reason='Symbols must be configured')
 def test_new_failover_cluster_two_member(BigIPSetup):
     a, b, c = BigIPSetup
     bigip_list = [a, b]
@@ -89,6 +91,8 @@ def test_new_failover_cluster_two_member(BigIPSetup):
     cm.teardown()
 
 
+@pytest.mark.skipif(pytest.config.getoption('--symbols') is None,
+                    reason='Symbols must be configured')
 def test_new_failover_cluster_three_member(BigIPSetup):
     a, b, c = BigIPSetup
     bigip_list = [a, b, c]
@@ -102,6 +106,8 @@ def test_new_failover_cluster_three_member(BigIPSetup):
     cm.teardown()
 
 
+@pytest.mark.skipif(pytest.config.getoption('--symbols') is None,
+                    reason='Symbols must be configured')
 def test_existing_failover_cluster(BigIPSetup):
     a, b, c = BigIPSetup
     bigip_list = [a, b]
@@ -118,6 +124,8 @@ def test_existing_failover_cluster(BigIPSetup):
     cm.teardown()
 
 
+@pytest.mark.skipif(pytest.config.getoption('--symbols') is None,
+                    reason='Symbols must be configured')
 def test_scale_up_sync_failover(BigIPSetup, ThreeBigIPTeardownSyncFailover):
     a, b, c = BigIPSetup
     bigip_list = [a, b]
@@ -130,6 +138,8 @@ def test_scale_up_sync_failover(BigIPSetup, ThreeBigIPTeardownSyncFailover):
     cm.scale_up_by_one(c)
 
 
+@pytest.mark.skipif(pytest.config.getoption('--symbols') is None,
+                    reason='Symbols must be configured')
 def test_scale_up_down_up_down_sync_failover(
         BigIPSetup, TwoBigIPTeardownSyncFailover):
     a, b, c = BigIPSetup

test/functional/ssl_profile_creation/test_ssl_profile_creation.py

@@ -65,6 +65,8 @@ def cleaner():
     request.addfinalizer(cleaner)
 
 
+@pytest.mark.skipif(pytest.config.getoption('--symbols') is None,
+                    reason='Symbols must be configured')
 def test_ssl_profile_creation(cleaner, symbols, tmpdir):
     testdatadir = tmpdir.mkdir('testdir')
     FAKEKEYFILENAME = 'fakekey.key'

test/functional/tm/ltm/test_profile.py

@@ -561,9 +561,10 @@ def test_CURDL(self, request, bigip):
         assert ocsp1.cacheErrorTimeout == 3000
 
         # Testing load
-        ocsp2 = bigip.ltm.profile.ocsp_stapling_params_s
-        ocsp2.ocsp_stapling_params.load(
+        ocsp_params = bigip.ltm.profile.ocsp_stapling_params_s
+        ocsp2 = ocsp_params.ocsp_stapling_params.load(
             partition='Common', name='test.ocsp_stapling_params')
+
         assert ocsp1.selfLink == ocsp2.selfLink
 
 

test/functional/tm/sys/test_httpd.py

@@ -28,9 +28,9 @@ def teardown():
 class TestHttpd(object):
     def test_load(self, cleaner, bigip):
         httpd = bigip.sys.httpd.load()
-        assert httpd.maxClients == 20
+        assert httpd.maxClients == 10
         httpd.refresh()
-        assert httpd.maxClients == 20
+        assert httpd.maxClients == 10
 
     def test_update(self, cleaner, bigip):
         httpd = bigip.sys.httpd.load()