[checkmk-commits] AWS instance creators: Shortened class names

Module: check_mk Branch: master Commit: e375532bbceaf63719ca798c8a1b8bceda077ad7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e375532bbceaf6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 25 10:04:31 2019 +0200 AWS instance creators: Shortened class names Change-Id: I64d95bbfbd5b9349be468ba40e67826e0f5cbe56 --- .../agent_aws/agent_aws_fake_clients.py | 20 ++++++++++---------- .../agent_aws/test_agent_aws_costs_and_usage.py | 4 ++-- .../special_agents/agent_aws/test_agent_aws_elb.py | 15 ++++++--------- .../special_agents/agent_aws/test_agent_aws_rds.py | 4 ++-- .../special_agents/agent_aws/test_agent_aws_s3.py | 10 +++++----- 5 files changed, 25 insertions(+), 28 deletions(-) diff --git a/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py b/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py index 0bf6d65..b4d72c6 100644 --- a/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py +++ b/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py @@ -150,13 +150,13 @@ class InstanceCreator(object): # .--S3------------------------------------------------------------------- -class S3ListBucketsInstanceCreator(InstanceCreator): +class S3ListBucketsIC(InstanceCreator): def _fill_instance(self): self.add(Str('Name')) self.add(Timestamp('CreationDate')) -class S3BucketTaggingInstanceCreator(InstanceCreator): +class S3BucketTaggingIC(InstanceCreator): def _fill_instance(self): self.add(Str('Key')) self.add(Str('Value')) @@ -166,7 +166,7 @@ class S3BucketTaggingInstanceCreator(InstanceCreator): # .--Cloudwatch----------------------------------------------------------- -class CloudwatchDescribeAlarmsInstanceCreator(InstanceCreator): +class CloudwatchDescribeAlarmsIC(InstanceCreator): def _fill_instance(self): self.add(Str('AlarmName')) self.add(Str('AlarmArn')) @@ -291,7 +291,7 @@ class CloudwatchDescribeAlarmsInstanceCreator(InstanceCreator): # .--CE------------------------------------------------------------------- -class CEGetCostsAndUsageInstanceCreator(InstanceCreator): +class CEGetCostsAndUsageIC(InstanceCreator): def _fill_instance(self): self.add(Dict('TimePeriod', [ Str('Start'), @@ -316,7 +316,7 @@ class CEGetCostsAndUsageInstanceCreator(InstanceCreator): # .--RDS------------------------------------------------------------------ -class RDSDescribeAccountAttributesInstanceCreator(InstanceCreator): +class RDSDescribeAccountAttributesIC(InstanceCreator): def _fill_instance(self): # TODO for each choice one entry self.add( @@ -341,7 +341,7 @@ class RDSDescribeAccountAttributesInstanceCreator(InstanceCreator): self.add(Int('Max')) -class RDSDescribeDBInstancesInstanceCreator(InstanceCreator): +class RDSDescribeDBInstancesIC(InstanceCreator): def _fill_instance(self): self.add(Str('DBInstanceIdentifier')) self.add(Str('DBInstanceClass')) @@ -483,7 +483,7 @@ class RDSDescribeDBInstancesInstanceCreator(InstanceCreator): # .--ELB------------------------------------------------------------------ -class ELBDescribeLoadBalancersInstanceCreator(InstanceCreator): +class ELBDescribeLoadBalancersIC(InstanceCreator): def _fill_instance(self): self.add(Str('LoadBalancerName')) self.add(Str('DNSName')) @@ -543,7 +543,7 @@ class ELBDescribeLoadBalancersInstanceCreator(InstanceCreator): ])) -class ELBDescribeTagsInstanceCreator(InstanceCreator): +class ELBDescribeTagsIC(InstanceCreator): def _fill_instance(self): self.add(Str('LoadBalancerName')) self.add(List('Tags', [ @@ -552,7 +552,7 @@ class ELBDescribeTagsInstanceCreator(InstanceCreator): ])) -class ELBDescribeInstanceHealthInstanceCreator(InstanceCreator): +class ELBDescribeInstanceHealthIC(InstanceCreator): def _fill_instance(self): self.add(Str('InstanceId')) self.add(Choice('State', ["InService", "OutOfServic", "Unknown"])) @@ -574,7 +574,7 @@ class ELBDescribeInstanceHealthInstanceCreator(InstanceCreator): class FakeCloudwatchClient(object): def describe_alarms(self, AlarmNames=None): - alarms = CloudwatchDescribeAlarmsInstanceCreator.create_instances(amount=2) + alarms = CloudwatchDescribeAlarmsIC.create_instances(amount=2) if AlarmNames: alarms = [alarm for alarm in alarms if alarm['AlarmName'] in AlarmNames] return {'MetricAlarms': alarms, 'NextToken': 'string'} diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py index e85a6d2..950614c 100644 --- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_costs_and_usage.py @@ -1,7 +1,7 @@ # encoding: utf-8 from agent_aws_fake_clients import ( - CEGetCostsAndUsageInstanceCreator,) + CEGetCostsAndUsageIC,) from cmk.special_agents.agent_aws import ( AWSConfig, @@ -17,7 +17,7 @@ class FakeCEClient(object): 'Type': "'DIMENSION' | 'TAG'", 'Key': 'string' },], - 'ResultsByTime': CEGetCostsAndUsageInstanceCreator.create_instances(amount=1), + 'ResultsByTime': CEGetCostsAndUsageIC.create_instances(amount=1), } diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py index b71dc29..66c5617 100644 --- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py @@ -3,9 +3,9 @@ import pytest from agent_aws_fake_clients import ( FakeCloudwatchClient, - ELBDescribeLoadBalancersInstanceCreator, - ELBDescribeTagsInstanceCreator, - ELBDescribeInstanceHealthInstanceCreator, + ELBDescribeLoadBalancersIC, + ELBDescribeTagsIC, + ELBDescribeInstanceHealthIC, ) from cmk.special_agents.agent_aws import ( @@ -22,8 +22,7 @@ from cmk.special_agents.agent_aws import ( class FakeELBClient(object): def describe_load_balancers(self, LoadBalancerNames=None): return { - 'LoadBalancerDescriptions': - ELBDescribeLoadBalancersInstanceCreator.create_instances(amount=3), + 'LoadBalancerDescriptions': ELBDescribeLoadBalancersIC.create_instances(amount=3), 'NextMarker': 'string', } @@ -51,13 +50,11 @@ class FakeELBClient(object): for lb_name in LoadBalancerNames: if lb_name not in ["LoadBalancerName-0", "LoadBalancerName-1"]: continue - tag_descrs.extend(ELBDescribeTagsInstanceCreator.create_instances(amount=1)) + tag_descrs.extend(ELBDescribeTagsIC.create_instances(amount=1)) return {'TagDescriptions': tag_descrs} def describe_instance_health(self, LoadBalancerName=None): - return { - 'InstanceStates': ELBDescribeInstanceHealthInstanceCreator.create_instances(amount=1) - } + return {'InstanceStates': ELBDescribeInstanceHealthIC.create_instances(amount=1)} @pytest.fixture() diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py index a62fcff..4136160 100644 --- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_rds.py @@ -2,7 +2,7 @@ import pytest from agent_aws_fake_clients import ( - RDSDescribeDBInstancesInstanceCreator, + RDSDescribeDBInstancesIC, FakeCloudwatchClient, ) @@ -105,7 +105,7 @@ class FakeRDSClient(object): def describe_db_instances(self, DBInstanceIdentifier=None, Filters=None): return { 'Marker': 'string', - 'DBInstances': RDSDescribeDBInstancesInstanceCreator.create_instances(amount=2), + 'DBInstances': RDSDescribeDBInstancesIC.create_instances(amount=2), } diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_s3.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_s3.py index eb217be..2a84f99 100644 --- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_s3.py +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_s3.py @@ -3,8 +3,8 @@ import pytest from agent_aws_fake_clients import ( FakeCloudwatchClient, - S3ListBucketsInstanceCreator, - S3BucketTaggingInstanceCreator, + S3ListBucketsIC, + S3BucketTaggingIC, ) from cmk.special_agents.agent_aws import ( @@ -20,7 +20,7 @@ from cmk.special_agents.agent_aws import ( class FakeS3Client(object): def list_buckets(self): return { - 'Buckets': S3ListBucketsInstanceCreator.create_instances(amount=4), + 'Buckets': S3ListBucketsIC.create_instances(amount=4), 'Owner': { 'DisplayName': 'string', 'ID': 'string', @@ -37,11 +37,11 @@ class FakeS3Client(object): def get_bucket_tagging(self, Bucket=''): if Bucket == 'Name-0': return { - 'TagSet': S3BucketTaggingInstanceCreator.create_instances(amount=1), + 'TagSet': S3BucketTaggingIC.create_instances(amount=1), } elif Bucket == 'Name-1': return { - 'TagSet': S3BucketTaggingInstanceCreator.create_instances(amount=2), + 'TagSet': S3BucketTaggingIC.create_instances(amount=2), } return {}