Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions f5/bigip/tm/sys/sshd.py
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down
1 change: 1 addition & 0 deletions requirements.test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions test/functional/cluster/test_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions test/functional/tm/ltm/test_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
4 changes: 2 additions & 2 deletions test/functional/tm/sys/test_httpd.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading