diff --git a/Dockerfile b/Dockerfile index 2f938f79ad..c2b4138d0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ -FROM python:2.7 +FROM python:3.5 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app COPY . /usr/src/app RUN pip install --no-cache-dir . -r requirements/production.txt - EXPOSE 8900 CMD ["twistd", "-n", "mimic"] diff --git a/mimic/canned_responses/auth.py b/mimic/canned_responses/auth.py index a421fc1766..1e667ff994 100644 --- a/mimic/canned_responses/auth.py +++ b/mimic/canned_responses/auth.py @@ -3,7 +3,7 @@ Canned response for get auth token """ -from __future__ import absolute_import, division, unicode_literals + from datetime import datetime, timedelta diff --git a/mimic/canned_responses/fastly.py b/mimic/canned_responses/fastly.py index 7ba8f94e19..222ede4218 100644 --- a/mimic/canned_responses/fastly.py +++ b/mimic/canned_responses/fastly.py @@ -2,7 +2,7 @@ Canned response for fastly """ -from __future__ import absolute_import, division, unicode_literals + import random import string @@ -26,7 +26,7 @@ def get_current_customer(self): ("/current_customer") request. """ def _random_string(): - random_string = u''.join(random.choice( + random_string = ''.join(random.choice( string.ascii_uppercase + string.ascii_uppercase) for _ in range(20)) return random_string @@ -35,32 +35,32 @@ def _random_string(): owner_id = _random_string() current_customer = { - u'can_edit_matches': u'0', - u'can_read_public_ip_list': u'0', - u'can_upload_vcl': u'1', - u'updated_at': u'2014-11-03T23:37:44+00:00', - u'has_config_panel': u'1', - u'has_improved_ssl_config': False, - u'id': id, - u'has_historical_stats': u'1', - u'has_openstack_logging': u'0', - u'can_configure_wordpress': u'0', - u'has_improved_logging': u'1', - u'readonly': '', - u'ip_whitelist': u'0.0.0.0/0', - u'owner_id': owner_id, - u'phone_number': u'770-123-1749', - u'postal_address': None, - u'billing_ref': None, - u'can_reset_passwords': True, - u'has_improved_security': u'1', - u'stripe_account': None, - u'name': u'Poppy - Test', - u'created_at': u'2014-11-03T23:37:43+00:00', - u'can_stream_syslog': u'1', - u'pricing_plan': u'developer', - u'billing_contact_id': None, - u'has_streaming': u'1'} + 'can_edit_matches': '0', + 'can_read_public_ip_list': '0', + 'can_upload_vcl': '1', + 'updated_at': '2014-11-03T23:37:44+00:00', + 'has_config_panel': '1', + 'has_improved_ssl_config': False, + 'id': id, + 'has_historical_stats': '1', + 'has_openstack_logging': '0', + 'can_configure_wordpress': '0', + 'has_improved_logging': '1', + 'readonly': '', + 'ip_whitelist': '0.0.0.0/0', + 'owner_id': owner_id, + 'phone_number': '770-123-1749', + 'postal_address': None, + 'billing_ref': None, + 'can_reset_passwords': True, + 'has_improved_security': '1', + 'stripe_account': None, + 'name': 'Poppy - Test', + 'created_at': '2014-11-03T23:37:43+00:00', + 'can_stream_syslog': '1', + 'pricing_plan': 'developer', + 'billing_contact_id': None, + 'has_streaming': '1'} return current_customer def create_service(self, url_data): @@ -79,42 +79,42 @@ def create_service(self, url_data): self.fastly_cache[service_name] = { 'service_details': { - u'comment': '', - u'locked': False, - u'updated_at': u'2014-11-13T14:29:10+00:00', - u'created_at': u'2014-11-13T14:29:10+00:00', - u'testing': None, - u'number': 1, - u'staging': None, - u'active': None, - u'service_id': service_id, - u'deleted_at': None, - u'inherit_service_id': None, - u'deployed': None}, + 'comment': '', + 'locked': False, + 'updated_at': '2014-11-13T14:29:10+00:00', + 'created_at': '2014-11-13T14:29:10+00:00', + 'testing': None, + 'number': 1, + 'staging': None, + 'active': None, + 'service_id': service_id, + 'deleted_at': None, + 'inherit_service_id': None, + 'deployed': None}, 'service_name': service_name } self.fastly_cache[service_id] = self.fastly_cache[service_name] create_service = { - u'comment': '', - u'publish_key': publish_key, - u'name': service_name, - u'versions': [{u'comment': '', u'locked': u'0', - u'service': service_id, - u'updated_at': u'2014-11-12T18:43:21', - u'created_at': u'2014-11-12T18:43:21', - u'testing': None, u'number': u'1', - u'staging': None, - u'active': None, - u'service_id': service_id, - u'deleted_at': None, - u'inherit_service_id': None, - u'deployed': None, - u'backend': 0}], - u'created_at': u'2014-11-12T18:43:21+00:00', - u'updated_at': u'2014-11-12T18:43:21+00:00', - u'customer_id': data['customer_id'], - u'id': service_id} + 'comment': '', + 'publish_key': publish_key, + 'name': service_name, + 'versions': [{'comment': '', 'locked': '0', + 'service': service_id, + 'updated_at': '2014-11-12T18:43:21', + 'created_at': '2014-11-12T18:43:21', + 'testing': None, 'number': '1', + 'staging': None, + 'active': None, + 'service_id': service_id, + 'deleted_at': None, + 'inherit_service_id': None, + 'deployed': None, + 'backend': 0}], + 'created_at': '2014-11-12T18:43:21+00:00', + 'updated_at': '2014-11-12T18:43:21+00:00', + 'customer_id': data['customer_id'], + 'id': service_id} return create_service def get_service_by_name(self, service_name): @@ -190,31 +190,31 @@ def create_backend(self, url_data, service_id, service_version): request_dict = {k: v[0] for k, v in url_data} create_backend = { - u'comment': '', - u'shield': None, - u'weight': 100, - u'ssl_client_key': None, - u'first_byte_timeout': 15000, - u'auto_loadbalance': False, - u'use_ssl': request_dict['use_ssl'], - u'port': request_dict['port'], - u'ssl_hostname': None, - u'hostname': request_dict['name'], - u'error_threshold': 0, - u'max_conn': 20, - u'version': service_version, - u'ipv4': None, - u'ipv6': None, - u'client_cert': None, - u'ssl_ca_cert': None, - u'request_condition': '', - u'healthcheck': None, - u'address': request_dict['address'], - u'ssl_client_cert': None, - u'name': request_dict['name'], - u'connect_timeout': 1000, - u'between_bytes_timeout': 10000, - u'service_id': service_id} + 'comment': '', + 'shield': None, + 'weight': 100, + 'ssl_client_key': None, + 'first_byte_timeout': 15000, + 'auto_loadbalance': False, + 'use_ssl': request_dict['use_ssl'], + 'port': request_dict['port'], + 'ssl_hostname': None, + 'hostname': request_dict['name'], + 'error_threshold': 0, + 'max_conn': 20, + 'version': service_version, + 'ipv4': None, + 'ipv6': None, + 'client_cert': None, + 'ssl_ca_cert': None, + 'request_condition': '', + 'healthcheck': None, + 'address': request_dict['address'], + 'ssl_client_cert': None, + 'name': request_dict['name'], + 'connect_timeout': 1000, + 'between_bytes_timeout': 10000, + 'service_id': service_id} if 'origin_list' not in self.fastly_cache[service_id]: self.fastly_cache[service_id]['origin_list'] = [] @@ -234,13 +234,13 @@ def create_condition(self, url_data, service_id, service_version): request_dict = {k: v[0] for k, v in url_data} create_condition = { - u"type": "REQUEST", - u"comment": "", - u"name": "condition", - u"version": service_version, - u"service_id": service_id, - u"statement": request_dict['statement'], - u"priority": request_dict['priority'] + "type": "REQUEST", + "comment": "", + "name": "condition", + "version": service_version, + "service_id": service_id, + "statement": request_dict['statement'], + "priority": request_dict['priority'] } if 'condition_list' not in self.fastly_cache[service_id]: @@ -374,14 +374,14 @@ def get_service_details(self, service_id): """ version_details = self.fastly_cache[service_id]['service_details'] service_details = { - u'id': service_id, - u'name': self.fastly_cache[service_id]['service_name'], - u'customer_id': "hTE5dRlSBICGPJxJwCH4M", - u'comment': "", - u"updated_at": "2012-06-14T21:20:19+00:00", - u"created_at": "2012-06-14T21:20:19+00:00", - u"publish_key": "xgdbdd93h5066f8d330c276fDe00f9d293abfex7", - u'versions': [version_details]} + 'id': service_id, + 'name': self.fastly_cache[service_id]['service_name'], + 'customer_id': "hTE5dRlSBICGPJxJwCH4M", + 'comment': "", + "updated_at": "2012-06-14T21:20:19+00:00", + "created_at": "2012-06-14T21:20:19+00:00", + "publish_key": "xgdbdd93h5066f8d330c276fDe00f9d293abfex7", + 'versions': [version_details]} return service_details diff --git a/mimic/canned_responses/glance.py b/mimic/canned_responses/glance.py index 116fe1554d..e46a9d2c35 100644 --- a/mimic/canned_responses/glance.py +++ b/mimic/canned_responses/glance.py @@ -2,7 +2,7 @@ Cannned responses for glance images """ -from __future__ import absolute_import, division, unicode_literals + from mimic.canned_responses.json.glance.glance_images_json import (images, image_schema) diff --git a/mimic/canned_responses/json/glance/glance_images_json.py b/mimic/canned_responses/json/glance/glance_images_json.py index f950f9e2bf..048c5ec6a4 100644 --- a/mimic/canned_responses/json/glance/glance_images_json.py +++ b/mimic/canned_responses/json/glance/glance_images_json.py @@ -2,7 +2,7 @@ Glance images """ -from __future__ import absolute_import, division, unicode_literals + images = { "images": diff --git a/mimic/canned_responses/loadbalancer.py b/mimic/canned_responses/loadbalancer.py index 5a9dbf8dd5..9a4137b328 100644 --- a/mimic/canned_responses/loadbalancer.py +++ b/mimic/canned_responses/loadbalancer.py @@ -4,7 +4,7 @@ add/get/delete/list nodes """ -from __future__ import absolute_import, division, unicode_literals + from random import randrange diff --git a/mimic/canned_responses/maas_alarm_examples.py b/mimic/canned_responses/maas_alarm_examples.py index b07e9e0797..aeb6663b3d 100644 --- a/mimic/canned_responses/maas_alarm_examples.py +++ b/mimic/canned_responses/maas_alarm_examples.py @@ -2,7 +2,7 @@ Canned responses for MAAS alarm examples. """ -from __future__ import absolute_import, division, unicode_literals + def alarm_examples(): diff --git a/mimic/canned_responses/maas_json_home.py b/mimic/canned_responses/maas_json_home.py index d841b374f3..f0ae80a331 100644 --- a/mimic/canned_responses/maas_json_home.py +++ b/mimic/canned_responses/maas_json_home.py @@ -2,7 +2,7 @@ Canned response for monitoring json home """ -from __future__ import unicode_literals + def json_home(url): diff --git a/mimic/canned_responses/maas_monitoring_zones.py b/mimic/canned_responses/maas_monitoring_zones.py index 3fa2d75aba..1f16881bc9 100644 --- a/mimic/canned_responses/maas_monitoring_zones.py +++ b/mimic/canned_responses/maas_monitoring_zones.py @@ -2,7 +2,7 @@ Canned responses for MAAS monitoring zones. """ -from __future__ import absolute_import, division, unicode_literals + def monitoring_zones(): diff --git a/mimic/canned_responses/mimic_presets.py b/mimic/canned_responses/mimic_presets.py index 031c456b85..5d1d9500ed 100644 --- a/mimic/canned_responses/mimic_presets.py +++ b/mimic/canned_responses/mimic_presets.py @@ -2,7 +2,7 @@ Defines the preset values in the mimic api. """ -from __future__ import absolute_import, division, unicode_literals + get_presets = {"loadbalancers": {"lb_building": "On create load balancer, keeps the load balancer in " diff --git a/mimic/canned_responses/noit.py b/mimic/canned_responses/noit.py index 4f9ec4a18e..6b01b493e5 100644 --- a/mimic/canned_responses/noit.py +++ b/mimic/canned_responses/noit.py @@ -2,7 +2,7 @@ Canned response for Noit """ -from __future__ import absolute_import, division, unicode_literals + import time from mimic.canned_responses.noit_metrics_fixture import (metrics_common_template, @@ -106,7 +106,7 @@ def get_all_checks(): } } check_list = [] - for key, value in noit_cache.items(): + for key, value in list(noit_cache.items()): each_check = value["check"]["attributes"] each_check["uuid"] = key each_check["config"] = value["check"]["config"] diff --git a/mimic/canned_responses/noit_metrics_fixture.py b/mimic/canned_responses/noit_metrics_fixture.py index 9e5c3ac6e6..0c6a92fef7 100644 --- a/mimic/canned_responses/noit_metrics_fixture.py +++ b/mimic/canned_responses/noit_metrics_fixture.py @@ -2,7 +2,7 @@ Fixtures for metrics """ -from __future__ import absolute_import, division, unicode_literals + # Remove this when changing over to object model # as this is repeated within the check_template diff --git a/mimic/canned_responses/nova.py b/mimic/canned_responses/nova.py index cd274d219a..b367ea7c20 100644 --- a/mimic/canned_responses/nova.py +++ b/mimic/canned_responses/nova.py @@ -3,7 +3,7 @@ Canned responses for nova's GET limits API """ -from __future__ import absolute_import, division, unicode_literals + def get_limit(): diff --git a/mimic/catalog.py b/mimic/catalog.py index 1af5d8f606..40826055b5 100644 --- a/mimic/catalog.py +++ b/mimic/catalog.py @@ -2,7 +2,7 @@ Classes which represent the objects within the service catalog. """ -from __future__ import absolute_import, division, unicode_literals + __all__ = ("Endpoint", "Entry") @@ -70,11 +70,11 @@ def url_with_prefix(self, uri_prefix, internal_url=False): # internal_url is ignored as anything hosted internally in # mimic will always use the same URL. postfix = self.tenant_id - segments = [uri_prefix.rstrip(u"/")] + segments = [uri_prefix.rstrip("/")] if self.prefix is not None: segments.append(self.prefix) segments.append(postfix) - return u"/".join(segments) + return "/".join(segments) class Entry(object): diff --git a/mimic/core.py b/mimic/core.py index f3a0ad8610..db16b76df9 100644 --- a/mimic/core.py +++ b/mimic/core.py @@ -4,7 +4,7 @@ Service catalog hub and integration for Mimic application objects. """ -from __future__ import absolute_import, division, unicode_literals + from twisted.python.urlpath import URLPath from twisted.plugin import getPlugins @@ -148,7 +148,7 @@ def add_api(self, api): 'An Existing API already exists with the given UUID' ) - for existing_api in self._uuid_to_api_external.values(): + for existing_api in list(self._uuid_to_api_external.values()): if existing_api.name_key == api.name_key: raise ServiceNameExists( 'An Existing API with UUID ' + existing_api.uuid_key + @@ -191,7 +191,7 @@ def get_external_apis(self): :returns: iterable of service ids for the external APIs """ - return self._uuid_to_api_external.keys() + return list(self._uuid_to_api_external.keys()) def get_external_api(self, api_id): """ @@ -278,7 +278,7 @@ def entries_for_tenant(self, tenant_id, prefix_map, base_uri): :return: The full URI locating the service for that region """ # Return all the external APIs - for service_id, api in self._uuid_to_api_external.items(): + for service_id, api in list(self._uuid_to_api_external.items()): for entry in api.catalog_entries(tenant_id): for endpoint in entry.endpoints: prefix_map[endpoint] = api.uri_for_service( @@ -287,7 +287,7 @@ def entries_for_tenant(self, tenant_id, prefix_map, base_uri): yield entry # Return all the internal APIs - for service_id, api in self._uuid_to_api_internal.items(): + for service_id, api in list(self._uuid_to_api_internal.items()): for entry in api.catalog_entries(tenant_id): for endpoint in entry.endpoints: prefix_map[endpoint] = self.uri_for_service( diff --git a/mimic/imimic.py b/mimic/imimic.py index 5516505cc3..8b125becf0 100644 --- a/mimic/imimic.py +++ b/mimic/imimic.py @@ -2,7 +2,7 @@ Interfaces for Mimic. """ -from __future__ import absolute_import, division, unicode_literals + from zope.interface import Attribute, Interface diff --git a/mimic/model/behaviors.py b/mimic/model/behaviors.py index 9cfbffe194..12ba0956eb 100644 --- a/mimic/model/behaviors.py +++ b/mimic/model/behaviors.py @@ -2,7 +2,7 @@ General-purpose utilities for customizing response behavior. """ -from __future__ import absolute_import, division, unicode_literals + import json import re @@ -161,7 +161,7 @@ def create_criteria(self, request_criteria): """ def create_criteria(): for crit_spec in request_criteria: - for k, v in crit_spec.items(): + for k, v in list(crit_spec.items()): yield self._criteria[k](v) return CriteriaCollection(criteria=list(create_criteria())) @@ -256,7 +256,7 @@ class BehaviorAPI(object): registry_collection = attr.ib( validator=attr.validators.instance_of(BehaviorRegistryCollection)) - for name, event in event_names_and_descriptions.items(): + for name, event in list(event_names_and_descriptions.items()): @BehaviorAPI.app.route('/{0}'.format(name), methods=['POST']) def register_behavior(kl_self, request): """ diff --git a/mimic/model/clb_errors.py b/mimic/model/clb_errors.py index 07078d96cf..90ef6a36f0 100644 --- a/mimic/model/clb_errors.py +++ b/mimic/model/clb_errors.py @@ -6,7 +6,7 @@ all over the request code right now. """ -from __future__ import absolute_import, division, unicode_literals + def considered_immutable_error(clb_state, lb_id): diff --git a/mimic/model/clb_objects.py b/mimic/model/clb_objects.py index 3d94011166..9c51fbeba6 100644 --- a/mimic/model/clb_objects.py +++ b/mimic/model/clb_objects.py @@ -5,7 +5,7 @@ for more information. """ -from __future__ import absolute_import, division, unicode_literals + from copy import deepcopy from random import randrange @@ -431,7 +431,7 @@ def list_load_balancers(self): self._verify_and_update_lb_state(lb_id, False, self.clock.seconds()) log.msg(self.lbs[lb_id]["status"]) return ( - {'loadBalancers': [lb.short_json() for lb in self.lbs.values()]}, + {'loadBalancers': [lb.short_json() for lb in list(self.lbs.values())]}, 200) def list_nodes(self, lb_id): diff --git a/mimic/model/cloudfeeds.py b/mimic/model/cloudfeeds.py index e593bfb19b..6f9ac6c3f4 100644 --- a/mimic/model/cloudfeeds.py +++ b/mimic/model/cloudfeeds.py @@ -5,7 +5,7 @@ for more details. """ -from __future__ import absolute_import, division, unicode_literals + import attr from six import string_types diff --git a/mimic/model/customer_objects.py b/mimic/model/customer_objects.py index c37857b5be..f9cc5a758d 100644 --- a/mimic/model/customer_objects.py +++ b/mimic/model/customer_objects.py @@ -2,7 +2,7 @@ Customer Contacts storage object """ -from __future__ import absolute_import, division, unicode_literals + import attr diff --git a/mimic/model/flavor_collections.py b/mimic/model/flavor_collections.py index 273350606e..e0e8b96357 100644 --- a/mimic/model/flavor_collections.py +++ b/mimic/model/flavor_collections.py @@ -2,7 +2,7 @@ Model objects for the flavors. """ -from __future__ import absolute_import, division, unicode_literals + from six import iteritems diff --git a/mimic/model/flavors.py b/mimic/model/flavors.py index b379ce2f4e..97a413e8c9 100644 --- a/mimic/model/flavors.py +++ b/mimic/model/flavors.py @@ -2,7 +2,7 @@ Model objects for mimic flavors. """ -from __future__ import absolute_import, division, unicode_literals + import attr diff --git a/mimic/model/glance_objects.py b/mimic/model/glance_objects.py index 47c62bef62..5c4a2c3ac9 100644 --- a/mimic/model/glance_objects.py +++ b/mimic/model/glance_objects.py @@ -2,7 +2,7 @@ Model objects for the Glance mimic. """ -from __future__ import absolute_import, division, unicode_literals + from json import dumps from uuid import uuid4 diff --git a/mimic/model/identity.py b/mimic/model/identity.py index d71c162ed6..e82b60e92d 100644 --- a/mimic/model/identity.py +++ b/mimic/model/identity.py @@ -2,7 +2,7 @@ Models relating to identity. """ -from __future__ import absolute_import, division, unicode_literals + from uuid import uuid4 diff --git a/mimic/model/identity_objects.py b/mimic/model/identity_objects.py index 07a1a1bf6b..ba26dadf25 100644 --- a/mimic/model/identity_objects.py +++ b/mimic/model/identity_objects.py @@ -2,7 +2,7 @@ Model objects for the Identity mimic. """ -from __future__ import absolute_import, division, unicode_literals + import attr @@ -158,13 +158,13 @@ class EndpointTemplateStore(object): optional_mapping = [ MapInfo(*value) for value in [ ('enabled', 'enabled_key', False), - ('publicURL', 'public_url', u""), - ('internalURL', 'internal_url', u""), - ('adminURL', 'admin_url', u""), + ('publicURL', 'public_url', ""), + ('internalURL', 'internal_url', ""), + ('adminURL', 'admin_url', ""), ('RAX-AUTH:tenantAlias', 'tenant_alias', "%tenant_id%"), - ('versionId', 'version_id', u""), - ('versionInfo', 'version_info', u""), - ('versionList', 'version_list', u"") + ('versionId', 'version_id', ""), + ('versionInfo', 'version_info', ""), + ('versionList', 'version_list', "") ] ] @@ -329,7 +329,7 @@ def list_tenant_endpoints(self, tenant_id): # (a) enabled or (b) in the list of endpoints specifically # enabled for the tenant endpoints = [] - for _, endpoint_template in self.endpoint_templates.items(): + for _, endpoint_template in list(self.endpoint_templates.items()): if (endpoint_template.enabled_key or endpoint_template.id_key in tenant_specific_templates): endpoints.append( @@ -369,7 +369,7 @@ def list_tenant_templates(self, tenant_id): # provide an Endpoint Entry for every template that is either # (a) enabled or (b) in the list of endpoints specifically # enabled for the tenant - for _, endpoint_template in self.endpoint_templates.items(): + for _, endpoint_template in list(self.endpoint_templates.items()): if (endpoint_template.enabled_key or endpoint_template.id_key in tenant_specific_templates): yield endpoint_template @@ -385,7 +385,7 @@ def enable_endpoint_for_tenant(self, tenant_id, template_id): if tenant_id not in self.endpoints_for_tenants: self.endpoints_for_tenants[tenant_id] = [] - for key, endpoint_template in self.endpoint_templates.items(): + for key, endpoint_template in list(self.endpoint_templates.items()): if endpoint_template.id_key == template_id: self.endpoints_for_tenants[tenant_id].append(template_id) return @@ -419,7 +419,7 @@ def list_templates(self): :returns: an iterable of the endpoint templates :rtype: iterable """ - return self.endpoint_templates.values() + return list(self.endpoint_templates.values()) def add_template(self, endpoint_template): """ @@ -507,7 +507,7 @@ def remove_template(self, template_id): :raises: IndexError if the template does not exist """ # Disable (remove) the templates for all tenants - for tenant_id in self.endpoints_for_tenants.keys(): + for tenant_id in list(self.endpoints_for_tenants.keys()): try: self.disable_endpoint_for_tenant(tenant_id, template_id) except EndpointTemplateDisabledForTenant: @@ -556,7 +556,7 @@ def uri_for_service(self, region, service_id): :rtype: six.text_type """ # key doesn't matter, region is the only interesting thing - for _, endpoint_template in self.endpoint_templates.items(): + for _, endpoint_template in list(self.endpoint_templates.items()): if endpoint_template.region_key == region or region == '': # since Mimic only utilizes the public URL return endpoint_template.public_url diff --git a/mimic/model/ironic_objects.py b/mimic/model/ironic_objects.py index c59a377f0c..2b33e54da7 100644 --- a/mimic/model/ironic_objects.py +++ b/mimic/model/ironic_objects.py @@ -2,7 +2,7 @@ Model objects for the Nova mimic. """ -from __future__ import absolute_import, division, unicode_literals + import attr from uuid import uuid4 diff --git a/mimic/model/keypair_objects.py b/mimic/model/keypair_objects.py index 7bd3a53e26..c1daf8aa5e 100644 --- a/mimic/model/keypair_objects.py +++ b/mimic/model/keypair_objects.py @@ -2,7 +2,7 @@ Keypair objects for mimic """ -from __future__ import absolute_import, division, unicode_literals + import json diff --git a/mimic/model/maas_errors.py b/mimic/model/maas_errors.py index 0772c93806..369a92316a 100644 --- a/mimic/model/maas_errors.py +++ b/mimic/model/maas_errors.py @@ -2,7 +2,7 @@ Errors like the error cases from Rackspace Monitoring. """ -from __future__ import division, unicode_literals + import attr from six import text_type diff --git a/mimic/model/maas_objects.py b/mimic/model/maas_objects.py index 1eb5b0304a..f65c19ec8c 100644 --- a/mimic/model/maas_objects.py +++ b/mimic/model/maas_objects.py @@ -2,7 +2,7 @@ MaaS API data model """ -from __future__ import absolute_import, division, unicode_literals + import collections import random @@ -71,13 +71,13 @@ def list_checks(self): """ Lists checks under this Entity. """ - return [check.to_json() for check in self.checks.values()] + return [check.to_json() for check in list(self.checks.values())] def list_alarms(self): """ Lists alarms under this Entity. """ - return [alarm.to_json() for alarm in self.alarms.values()] + return [alarm.to_json() for alarm in list(self.alarms.values())] @attr.s @@ -821,7 +821,7 @@ def latest_alarm_states_for_entity(self, entity_id): latest_alarm_states_by_alarm = {} for state in alarm_states_for_entity: latest_alarm_states_by_alarm[state.alarm_id] = state - return latest_alarm_states_by_alarm.values() + return list(latest_alarm_states_by_alarm.values()) def list_connections_for_agent(self, agent_id): """ diff --git a/mimic/model/mailgun_objects.py b/mimic/model/mailgun_objects.py index 4a0b576b50..cc7ab815c1 100644 --- a/mimic/model/mailgun_objects.py +++ b/mimic/model/mailgun_objects.py @@ -2,7 +2,7 @@ Mailgun object storage """ -from __future__ import absolute_import, division, unicode_literals + import attr import time diff --git a/mimic/model/nova_image_collection.py b/mimic/model/nova_image_collection.py index ca428f1048..45e7791680 100644 --- a/mimic/model/nova_image_collection.py +++ b/mimic/model/nova_image_collection.py @@ -2,7 +2,7 @@ Model objects for images. """ -from __future__ import absolute_import, division, unicode_literals + import attr from json import dumps diff --git a/mimic/model/nova_objects.py b/mimic/model/nova_objects.py index 7fe364aa47..07429991d4 100644 --- a/mimic/model/nova_objects.py +++ b/mimic/model/nova_objects.py @@ -2,7 +2,7 @@ Model objects for the Nova mimic. """ -from __future__ import absolute_import, division, unicode_literals + import re import uuid @@ -297,7 +297,7 @@ def validate_metadata(cls, metadata, max_metadata_items=40): raise LimitError(nova_message=( "Maximum number of metadata items exceeds {0}" .format(max_metadata_items))) - if not all(isinstance(v, string_types) for v in metadata.values()): + if not all(isinstance(v, string_types) for v in list(metadata.values())): raise BadRequestError(nova_message=( "Invalid metadata: The input is not a string or unicode")) @@ -402,7 +402,7 @@ def metadata_criterion(value): :type value: dict mapping unicode to unicode """ def predicate(attribute): - for k, v in value.items(): + for k, v in list(value.items()): if not re.compile(v).match(attribute.get(k, "")): return False return True @@ -602,11 +602,11 @@ def create_building_behavior(parameters): @default_with_hook def set_building(server): - server.update_status(u"BUILD") + server.update_status("BUILD") server.collection.clock.callLater( duration, server.update_status, - u"ACTIVE") + "ACTIVE") return set_building @@ -621,7 +621,7 @@ def create_error_status_behavior(parameters=None): """ @default_with_hook def set_error(server): - server.update_status(u"ERROR") + server.update_status("ERROR") return set_error @@ -641,11 +641,11 @@ def active_then_error(parameters): @default_with_hook def fail_later(server): - server.update_status(u"ACTIVE") + server.update_status("ACTIVE") server.collection.clock.callLater( duration, server.update_status, - u"ERROR") + "ERROR") return fail_later @@ -682,7 +682,7 @@ def server_by_id(self, server_id): Retrieve a :obj:`Server` object by its ID. """ for server in self.servers: - if server.server_id == server_id and server.status != u"DELETED": + if server.server_id == server_id and server.status != "DELETED": return server def request_creation(self, creation_http_request, creation_json, @@ -732,7 +732,7 @@ def request_ips(self, http_get_ips_request, server_id): return dumps({"addresses": server.addresses_json()}) def request_list(self, http_get_request, include_details, absolutize_url, - name=u"", limit=None, marker=None, changes_since=None): + name="", limit=None, marker=None, changes_since=None): """ Request the list JSON for all servers. @@ -771,7 +771,7 @@ def request_list(self, http_get_request, include_details, absolutize_url, if name in server.server_name] if changes_since is None: - to_be_listed = [s for s in to_be_listed if s.status != u"DELETED"] + to_be_listed = [s for s in to_be_listed if s.status != "DELETED"] if limit is not None: try: @@ -833,7 +833,7 @@ def request_delete(self, http_delete_request, server_id): http_delete_request.setResponseCode(500) return b'' http_delete_request.setResponseCode(204) - server.update_status(u"DELETED") + server.update_status("DELETED") return b'' def request_action(self, http_action_request, server_id, absolutize_url, @@ -906,7 +906,7 @@ def request_action(self, http_action_request, server_id, absolutize_url, server.collection.clock.callLater( 6.0, server.update_status, - u"ACTIVE") + "ACTIVE") return b'' elif reboot_type == 'SOFT': server.status = 'REBOOT' @@ -914,7 +914,7 @@ def request_action(self, http_action_request, server_id, absolutize_url, server.collection.clock.callLater( 3.0, server.update_status, - u"ACTIVE") + "ACTIVE") return b'' else: return dumps(bad_request("Argument 'type' for reboot is not HARD or SOFT", @@ -944,7 +944,7 @@ def request_action(self, http_action_request, server_id, absolutize_url, server.collection.clock.callLater( 5.0, server.update_status, - u"ACTIVE") + "ACTIVE") server_details = server.detail_json(absolutize_url) server_details['adminPass'] = 'password' return dumps({"server": server_details}) diff --git a/mimic/model/queue_objects.py b/mimic/model/queue_objects.py index 07f07a21bb..6297fb5447 100644 --- a/mimic/model/queue_objects.py +++ b/mimic/model/queue_objects.py @@ -2,7 +2,7 @@ Models for the Queue plugin """ -from __future__ import absolute_import, division, unicode_literals + import attr from six import text_type diff --git a/mimic/model/rackspace_image_store.py b/mimic/model/rackspace_image_store.py index f21845fdd8..73b6ce9f58 100644 --- a/mimic/model/rackspace_image_store.py +++ b/mimic/model/rackspace_image_store.py @@ -1,7 +1,7 @@ """ An image store representing Rackspace specific images """ -from __future__ import absolute_import, division, unicode_literals + import attr from six import iteritems from mimic.model.rackspace_images import (RackspaceWindowsImage, diff --git a/mimic/model/rackspace_images.py b/mimic/model/rackspace_images.py index 1b3edf2e2d..99851c9716 100644 --- a/mimic/model/rackspace_images.py +++ b/mimic/model/rackspace_images.py @@ -2,7 +2,7 @@ Model objects for mimic images. """ -from __future__ import absolute_import, division, unicode_literals + import attr import uuid diff --git a/mimic/model/valkyrie_objects.py b/mimic/model/valkyrie_objects.py index 980589ccc3..58ce48886a 100644 --- a/mimic/model/valkyrie_objects.py +++ b/mimic/model/valkyrie_objects.py @@ -2,7 +2,7 @@ Model objects for the Valkyrie mimic. """ -from __future__ import absolute_import, division, unicode_literals + import attr from json import dumps diff --git a/mimic/model/yo_objects.py b/mimic/model/yo_objects.py index 2d5ae7d58c..2a53fdbae8 100644 --- a/mimic/model/yo_objects.py +++ b/mimic/model/yo_objects.py @@ -2,7 +2,7 @@ Yo API data model """ -from __future__ import absolute_import, division, unicode_literals + import attr diff --git a/mimic/resource.py b/mimic/resource.py index f61792ca15..73570d668d 100644 --- a/mimic/resource.py +++ b/mimic/resource.py @@ -2,7 +2,7 @@ Resources for Mimic's core application. """ -from __future__ import unicode_literals + import json diff --git a/mimic/rest/cinder_api.py b/mimic/rest/cinder_api.py index ef3fa5f1ca..e7d753346c 100644 --- a/mimic/rest/cinder_api.py +++ b/mimic/rest/cinder_api.py @@ -3,7 +3,7 @@ Defines a mock for Cinder """ -from __future__ import absolute_import, division, print_function, unicode_literals + import json from uuid import uuid4 from six import text_type diff --git a/mimic/rest/cloudfeeds.py b/mimic/rest/cloudfeeds.py index 9eb70a9058..94d196786d 100644 --- a/mimic/rest/cloudfeeds.py +++ b/mimic/rest/cloudfeeds.py @@ -3,7 +3,7 @@ Defines the control plane API endpoints for the Cloudfeeds Plugin. """ -from __future__ import absolute_import, division, unicode_literals + from uuid import uuid4 from six import text_type diff --git a/mimic/rest/customer_api.py b/mimic/rest/customer_api.py index 5f615e2e7e..e317494dbc 100644 --- a/mimic/rest/customer_api.py +++ b/mimic/rest/customer_api.py @@ -3,7 +3,7 @@ API Mock for the Customer API. """ -from __future__ import absolute_import, division, unicode_literals + import json diff --git a/mimic/rest/fastly_api.py b/mimic/rest/fastly_api.py index 1f554829d0..1e1f9b3970 100644 --- a/mimic/rest/fastly_api.py +++ b/mimic/rest/fastly_api.py @@ -3,7 +3,7 @@ Defines get current customer """ -from __future__ import absolute_import, division, unicode_literals + import json @@ -64,7 +64,7 @@ def create_service(self, request): https://docs.fastly.com/api/config#service_5 """ - url_data = text_urldata(request.args).items() + url_data = list(text_urldata(request.args).items()) response = self.fastly_response.create_service(url_data) return json.dumps(response) @@ -100,7 +100,7 @@ def create_domain(self, request, service_id, version_id): https://docs.fastly.com/api/config#domain_4 """ - url_data = text_urldata(request.args).items() + url_data = list(text_urldata(request.args).items()) response = self.fastly_response.create_domain(url_data, service_id, version_id) return json.dumps(response) @@ -127,7 +127,7 @@ def create_backend(self, request, service_id, version_id): https://docs.fastly.com/api/config#backend_2 """ - url_data = text_urldata(request.args).items() + url_data = list(text_urldata(request.args).items()) response = self.fastly_response.create_backend(url_data, service_id, version_id) return json.dumps(response) @@ -141,7 +141,7 @@ def create_condition(self, request, service_id, version_id): https://docs.fastly.com/api/config#condition_3 """ - url_data = text_urldata(request.args).items() + url_data = list(text_urldata(request.args).items()) response = self.fastly_response.create_condition(url_data, service_id, version_id) return json.dumps(response) @@ -155,7 +155,7 @@ def create_cache_settings(self, request, service_id, version_id): https://docs.fastly.com/api/config#cache_settings_3 """ - url_data = text_urldata(request.args).items() + url_data = list(text_urldata(request.args).items()) response = self.fastly_response.create_cache_settings(url_data, service_id, version_id) return json.dumps(response) @@ -169,7 +169,7 @@ def create_response_object(self, request, service_id, version_id): https://docs.fastly.com/api/config#response_object_3 """ - url_data = text_urldata(request.args).items() + url_data = list(text_urldata(request.args).items()) response = self.fastly_response.create_response_object(url_data, service_id, version_id) return json.dumps(response) @@ -183,7 +183,7 @@ def create_settings(self, request, service_id, version_id): https://docs.fastly.com/api/config#settings_2 """ - url_data = text_urldata(request.args).items() + url_data = list(text_urldata(request.args).items()) response = self.fastly_response.create_settings(url_data, service_id, version_id) return json.dumps(response) diff --git a/mimic/rest/glance_api.py b/mimic/rest/glance_api.py index ef986f82fd..04663ab5e8 100644 --- a/mimic/rest/glance_api.py +++ b/mimic/rest/glance_api.py @@ -3,7 +3,7 @@ Defines a list of images from glance """ -from __future__ import absolute_import, division, unicode_literals + import json from uuid import uuid4 diff --git a/mimic/rest/heat_api.py b/mimic/rest/heat_api.py index faea75e3ae..3bf97633e5 100644 --- a/mimic/rest/heat_api.py +++ b/mimic/rest/heat_api.py @@ -163,7 +163,7 @@ def perform_action(self, request, tenant_id, stack_name, stack_id): body = json_from_request(request) valid_actions = ('cancel_update', 'check', 'resume', 'suspend') - if len(body.keys()) != 1 or list(body.keys())[0] not in valid_actions: + if len(list(body.keys())) != 1 or list(body.keys())[0] not in valid_actions: request.setResponseCode(400) return "Action in request must be one of {}".format( ", ".join(valid_actions)) diff --git a/mimic/rest/identity_api.py b/mimic/rest/identity_api.py index 47d004f89c..391bba30eb 100644 --- a/mimic/rest/identity_api.py +++ b/mimic/rest/identity_api.py @@ -3,7 +3,7 @@ Defines get token, impersonation """ -from __future__ import absolute_import, division, unicode_literals + import binascii import json @@ -754,7 +754,7 @@ def create_external_api_service(self, request): try: service_description = content['description'] except KeyError: - service_description = u"External API referenced by Mimic" + service_description = "External API referenced by Mimic" if service_id in self.core.get_external_apis(): return json.dumps( diff --git a/mimic/rest/ironic_api.py b/mimic/rest/ironic_api.py index 398d452639..de438199dc 100644 --- a/mimic/rest/ironic_api.py +++ b/mimic/rest/ironic_api.py @@ -4,7 +4,7 @@ http://docs.openstack.org/developer/ironic/webapi/v1.html """ -from __future__ import absolute_import, division, unicode_literals + from mimic.rest.mimicapp import MimicApp diff --git a/mimic/rest/loadbalancer_api.py b/mimic/rest/loadbalancer_api.py index 25d32c4416..1275a59c86 100644 --- a/mimic/rest/loadbalancer_api.py +++ b/mimic/rest/loadbalancer_api.py @@ -3,7 +3,7 @@ Defines add node and delete node from load balancers """ -from __future__ import absolute_import, division, unicode_literals + import json from uuid import uuid4 diff --git a/mimic/rest/maas_api.py b/mimic/rest/maas_api.py index 98e6e5417b..3e1f540eab 100644 --- a/mimic/rest/maas_api.py +++ b/mimic/rest/maas_api.py @@ -2,7 +2,7 @@ MAAS Mock API """ -from __future__ import division, unicode_literals + import json import collections @@ -93,16 +93,16 @@ def __init__(self, clock): self.entities = collections.OrderedDict() self.notifications = collections.OrderedDict( - [(u'ntTechnicalContactsEmail', - Notification(id=u'ntTechnicalContactsEmail', - label=u'Email All Technical Contacts', + [('ntTechnicalContactsEmail', + Notification(id='ntTechnicalContactsEmail', + label='Email All Technical Contacts', created_at=current_time_milliseconds, updated_at=current_time_milliseconds, - type=u'technicalContactsEmail'))]) + type='technicalContactsEmail'))]) self.notification_plans = collections.OrderedDict( - [(u'npTechnicalContactsEmail', - NotificationPlan(id=u'npTechnicalContactsEmail', - label=u'Technical Contacts - Email', + [('npTechnicalContactsEmail', + NotificationPlan(id='npTechnicalContactsEmail', + label='Technical Contacts - Email', created_at=current_time_milliseconds, updated_at=current_time_milliseconds))]) self.notificationtypes_list = [{'id': 'webhook', 'fields': [{'name': 'url', @@ -401,7 +401,7 @@ def _find_missing_required_key(cls, post_data, additional_keys): failed with a TypeError. """ fields_by_name = {field.name: field for field in attr.fields(cls)} - specified_keys = {key for sublist in [post_data.keys(), additional_keys] + specified_keys = {key for sublist in [list(post_data.keys()), additional_keys] for key in sublist} missing_keys = [key for key in fields_by_name if fields_by_name[key].default is attr.NOTHING and key not in specified_keys] @@ -443,7 +443,7 @@ def _metric_list_for_entity(maas_store, entity): 'label': check.label, 'type': check.type, 'metrics': _metric_list_for_check(maas_store, entity, check)} - for check in entity.checks.values()]} + for check in list(entity.checks.values())]} def _multiplot_interval(from_date, to_date, points): @@ -547,7 +547,7 @@ def _entity_cache_for_tenant(self, tenant_id): def _audit(self, app, request, tenant_id, status, content=b''): headers = {k.decode("utf-8"): [vv.decode("utf-8") if isinstance(vv, bytes) else vv for vv in v] - for k, v in request.getAllHeaders().items() + for k, v in list(request.getAllHeaders().items()) if k != b'x-auth-token'} record = { @@ -1268,7 +1268,7 @@ def get_notifications(self, request, tenant_id): 'next_marker': None, 'next_href': None} request.setResponseCode(200) - return json.dumps({'values': [nt.to_json() for nt in notifications.values()], + return json.dumps({'values': [nt.to_json() for nt in list(notifications.values())], 'metadata': metadata}) @app.route('/v1.0//notifications/', methods=['PUT']) @@ -1341,8 +1341,8 @@ def get_notification_plans(self, request, tenant_id): """ Get all notification plans """ - np_list = self._entity_cache_for_tenant( - tenant_id).notification_plans.values() + np_list = list(self._entity_cache_for_tenant( + tenant_id).notification_plans.values()) metadata = {'count': len(np_list), 'limit': 100, 'marker': None, @@ -1397,8 +1397,8 @@ def delete_notification_plan(self, request, tenant_id, np_id): tenant_id).notification_plans entities = self._entity_cache_for_tenant(tenant_id).entities alarmids_using_np = [alarm.id - for entity in entities.values() - for alarm in entity.alarms.values() + for entity in list(entities.values()) + for alarm in list(entity.alarms.values()) if alarm.notification_plan_id == np_id] if len(alarmids_using_np): @@ -1431,8 +1431,8 @@ def get_suppressions(self, request, tenant_id): """ Get the list of suppressions for this tenant. """ - sp_list = self._entity_cache_for_tenant( - tenant_id).suppressions.values() + sp_list = list(self._entity_cache_for_tenant( + tenant_id).suppressions.values()) metadata = { 'count': len(sp_list), 'limit': 100, @@ -1558,10 +1558,10 @@ def alarm_counts_per_np(self, request, tenant_id): values = [{'notification_plan_id': np.id, 'alarm_count': len([alarm - for entity in entities.values() - for alarm in entity.alarms.values() + for entity in list(entities.values()) + for alarm in list(entity.alarms.values()) if alarm.notification_plan_id == np.id])} - for np in notification_plans.values()] + for np in list(notification_plans.values())] metadata = {'limit': 100, 'marker': None, @@ -1578,8 +1578,8 @@ def alarms_by_np(self, request, tenant_id, np_id): """ entities = self._entity_cache_for_tenant(tenant_id).entities values = [alarm.to_json() - for entity in entities.values() - for alarm in entity.alarms.values() + for entity in list(entities.values()) + for alarm in list(entity.alarms.values()) if alarm.notification_plan_id == np_id] metadata = {'limit': 100, 'marker': None, @@ -1612,7 +1612,7 @@ def views_metric_list(self, request, tenant_id): entities = self._entity_cache_for_tenant(tenant_id).entities maas_store = self._entity_cache_for_tenant(tenant_id).maas_store values = [_metric_list_for_entity(maas_store, entity) - for entity in entities.values()] + for entity in list(entities.values())] metadata = {'count': len(values), 'marker': None, @@ -1637,8 +1637,8 @@ def multiplot(self, request, tenant_id): requested_check_ids = set([metric['check_id'] for metric in multiplot_request['metrics']]) checks_by_id = {check.id: check - for entity in entities.values() - for check in entity.checks.values() + for entity in list(entities.values()) + for check in list(entity.checks.values()) if check.id in requested_check_ids} for requested_metric in multiplot_request['metrics']: @@ -1682,7 +1682,7 @@ def latest_alarm_states(self, request, tenant_id): 'latest_alarm_states': [ state.detail_json() for state in maas_store.latest_alarm_states_for_entity(entity.id)]} - for entity in entities.values()] + for entity in list(entities.values())] metadata = {'count': len(values), 'marker': None, @@ -1889,7 +1889,7 @@ def create_alarm_state(self, request, tenant_id, entity_id, alarm_id): request.setResponseCode(e.code) return json.dumps(e.to_json()) - previous_state = u'UNKNOWN' + previous_state = 'UNKNOWN' alarm_states_same_entity_and_alarm = [ state for state in maas_store.alarm_states if state.entity_id == entity_id and state.alarm_id == alarm_id] @@ -1897,7 +1897,7 @@ def create_alarm_state(self, request, tenant_id, entity_id, alarm_id): previous_state = alarm_states_same_entity_and_alarm[-1].state monitoring_zone_id = request_body.get( - 'analyzed_by_monitoring_zone_id', u'mzord') + 'analyzed_by_monitoring_zone_id', 'mzord') new_state = None try: diff --git a/mimic/rest/mailgun_api.py b/mimic/rest/mailgun_api.py index 8aa7b2ba80..4df32513ce 100644 --- a/mimic/rest/mailgun_api.py +++ b/mimic/rest/mailgun_api.py @@ -4,7 +4,7 @@ https://documentation.mailgun.com/api-sending.html """ -from __future__ import absolute_import, division, unicode_literals + import json import time @@ -41,7 +41,7 @@ def send_messages(self, request): content = parse_qs(request.content.read().decode("utf-8")) to_address = content.get('to') headers = {} - for key, value in content.items(): + for key, value in list(content.items()): if key.startswith("h:") or key.startswith("v:"): headers[key] = value diff --git a/mimic/rest/mimicapp.py b/mimic/rest/mimicapp.py index fe15c39898..d42417eb8c 100644 --- a/mimic/rest/mimicapp.py +++ b/mimic/rest/mimicapp.py @@ -2,7 +2,7 @@ Contains the base Klein app for Mimic. """ -from __future__ import absolute_import, division, unicode_literals + from klein import Klein diff --git a/mimic/rest/neutron_api.py b/mimic/rest/neutron_api.py index 71c6aaf75d..837347859e 100644 --- a/mimic/rest/neutron_api.py +++ b/mimic/rest/neutron_api.py @@ -1,7 +1,7 @@ """ Neutron API Plugin """ -from __future__ import absolute_import, division, unicode_literals + import json from uuid import uuid4 diff --git a/mimic/rest/noit_api.py b/mimic/rest/noit_api.py index 8a77bf8e78..a005fd8781 100644 --- a/mimic/rest/noit_api.py +++ b/mimic/rest/noit_api.py @@ -3,7 +3,7 @@ Defines get token, impersonation """ -from __future__ import absolute_import, division, unicode_literals + import xmltodict from uuid import UUID diff --git a/mimic/rest/nova_api.py b/mimic/rest/nova_api.py index 7057415a08..dec58a63aa 100644 --- a/mimic/rest/nova_api.py +++ b/mimic/rest/nova_api.py @@ -3,7 +3,7 @@ Defines create, delete, get, list servers and get images and flavors. """ -from __future__ import absolute_import, division, unicode_literals + from uuid import uuid4 import json @@ -311,7 +311,7 @@ def _optextarg(name): self._region_collection_for_tenant(tenant_id) .request_list( request, include_details=False, absolutize_url=self.url, - name=_optextarg(b'name') or u'', + name=_optextarg(b'name') or '', limit=_optextarg(b'limit'), marker=_optextarg(b'marker'), ) @@ -332,7 +332,7 @@ def _optextarg(name): self._region_collection_for_tenant(tenant_id) .request_list( request, include_details=True, absolutize_url=self.url, - name=_optextarg(b'name') or u'', + name=_optextarg(b'name') or '', limit=_optextarg(b'limit'), marker=_optextarg(b'marker'), changes_since=_optextarg(b'changes-since') diff --git a/mimic/rest/queue_api.py b/mimic/rest/queue_api.py index ffbd30909c..5104f36886 100644 --- a/mimic/rest/queue_api.py +++ b/mimic/rest/queue_api.py @@ -2,7 +2,7 @@ API mock for Rackspace Queues. """ -from __future__ import absolute_import, division, unicode_literals + import json import collections diff --git a/mimic/rest/rackconnect_v3_api.py b/mimic/rest/rackconnect_v3_api.py index d067e196f1..6c1a3313af 100644 --- a/mimic/rest/rackconnect_v3_api.py +++ b/mimic/rest/rackconnect_v3_api.py @@ -5,7 +5,7 @@ http://docs.rcv3.apiary.io/ """ -from __future__ import absolute_import, division, unicode_literals + from collections import defaultdict import json diff --git a/mimic/rest/swift_api.py b/mimic/rest/swift_api.py index 1dbb0e2970..b93351dc02 100644 --- a/mimic/rest/swift_api.py +++ b/mimic/rest/swift_api.py @@ -4,7 +4,7 @@ API mock for OpenStack Swift / Rackspace Cloud Files. """ -from __future__ import absolute_import, division, unicode_literals + from uuid import uuid4, uuid5, NAMESPACE_URL from six import text_type @@ -47,12 +47,12 @@ def normal_tenant_id_to_crazy_mosso_id(normal_tenant_id): :return: a new tenant ID that looks like a Cloud Files tenant ID :rtype: unicode """ - full_namespace = (u"https://github.com/rackerlabs/mimic/ns/tenant/" + full_namespace = ("https://github.com/rackerlabs/mimic/ns/tenant/" + normal_tenant_id) if bytes is str: full_namespace = full_namespace.encode("ascii") uuid = uuid5(NAMESPACE_URL, full_namespace) - return u"MossoCloudFS_" + text_type(uuid) + return "MossoCloudFS_" + text_type(uuid) @implementer(IAPIMock, IPlugin) @@ -172,7 +172,7 @@ def byte_count(self): Return the sum of data of all the objects in the container """ byte_count = 0 - for obj in self.objects.values(): + for obj in list(self.objects.values()): byte_count += obj.length return byte_count @@ -214,7 +214,7 @@ def head_account(self, request): total_containers = len(self.containers) total_objects = 0 total_bytes = 0 - for container in self.containers.values(): + for container in list(self.containers.values()): total_objects += container.object_count total_bytes += container.byte_count container_count = "{0}".format(total_containers).encode("utf-8") @@ -228,7 +228,7 @@ def head_account(self, request): [object_count]) request.responseHeaders.setRawHeaders(b"x-account-bytes-used", [byte_count]) - for k, v in self.metadata.items(): + for k, v in list(self.metadata.items()): request.responseHeaders.setRawHeaders( "X-Account-Meta-{0}".format(k).encode("utf-8"), v) @@ -289,7 +289,7 @@ def get_container(self, request, container_name): request.setResponseCode(OK) return dumps([ obj.as_json() for obj in - self.containers[container_name].objects.values() + list(self.containers[container_name].objects.values()) ]) else: return NoResource("No such container") @@ -331,7 +331,7 @@ def set_header_if_not_none(header_key, obj_value): set_header_if_not_none( b"content-type", obj.content_type if obj.content_type is not None else - u"application/octet-stream") + "application/octet-stream") set_header_if_not_none(b"content-encoding", obj.content_encoding) set_header_if_not_none(b"etag", obj.etag) set_header_if_not_none(b"x-object-manifest", obj.object_manifest) @@ -365,7 +365,7 @@ def set_header_if_not_none(header_key, obj_value): set_header_if_not_none( b"content-type", obj.content_type if obj.content_type is not None else - u"application/octet-stream") + "application/octet-stream") set_header_if_not_none(b"content-encoding", obj.content_encoding) set_header_if_not_none(b"etag", obj.etag) set_header_if_not_none(b"x-object-manifest", obj.object_manifest) diff --git a/mimic/rest/valkyrie_api.py b/mimic/rest/valkyrie_api.py index f206e71a15..e891769eba 100644 --- a/mimic/rest/valkyrie_api.py +++ b/mimic/rest/valkyrie_api.py @@ -3,7 +3,7 @@ API Mock for Valkyrie. """ -from __future__ import absolute_import, division, unicode_literals + from mimic.rest.mimicapp import MimicApp diff --git a/mimic/rest/yo_api.py b/mimic/rest/yo_api.py index a5c1d57deb..53b5732467 100644 --- a/mimic/rest/yo_api.py +++ b/mimic/rest/yo_api.py @@ -2,7 +2,7 @@ API domain mock for Yo. """ -from __future__ import absolute_import, division, unicode_literals + import attr import json diff --git a/mimic/session.py b/mimic/session.py index 146a4a1820..d4224cd890 100644 --- a/mimic/session.py +++ b/mimic/session.py @@ -4,7 +4,7 @@ Implementation of simple in-memory session storage and generation for Mimic. """ -from __future__ import absolute_import, division, unicode_literals + from six import text_type from uuid import uuid4 diff --git a/mimic/tap.py b/mimic/tap.py index 239eaf1bd6..e2cc2c2a07 100644 --- a/mimic/tap.py +++ b/mimic/tap.py @@ -2,7 +2,7 @@ Twisted Application plugin for Mimic """ -from __future__ import absolute_import, division, unicode_literals + from twisted.application.strports import service from twisted.application.service import MultiService diff --git a/mimic/test/behavior_tests.py b/mimic/test/behavior_tests.py index b3b29de405..3db4c1ba10 100644 --- a/mimic/test/behavior_tests.py +++ b/mimic/test/behavior_tests.py @@ -6,7 +6,7 @@ (:see: :func:`register_behavior`) """ -from __future__ import absolute_import, division, unicode_literals + import json diff --git a/mimic/test/dummy.py b/mimic/test/dummy.py index 44657245b7..1ff6a2933f 100644 --- a/mimic/test/dummy.py +++ b/mimic/test/dummy.py @@ -2,7 +2,7 @@ Dummy classes that can be shared across test cases """ -from __future__ import absolute_import, division, unicode_literals + import uuid @@ -76,7 +76,7 @@ class ExampleDomainAPI(object): Example domain API the return nothing. """ - def __init__(self, domain=u"api.example.com", response=b'"test-value"'): + def __init__(self, domain="api.example.com", response=b'"test-value"'): """ Create an :obj:`ExampleDomainAPI`. @@ -101,11 +101,11 @@ def resource(self): return example_resource -def exampleEndpointTemplate(name=u"example", region="EXTERNAL", version="v1", +def exampleEndpointTemplate(name="example", region="EXTERNAL", version="v1", url="https://api.external.example.com:8080", public_url=None, internal_url=None, admin_url=None, version_info_url=None, version_list_url=None, - type_id=u"example", enabled=False, + type_id="example", enabled=False, endpoint_uuid=None, tenantid_alias="%tenant_id%"): """ @@ -176,7 +176,7 @@ def make_example_internal_api(case, response_message="default message", return iapi -def make_example_external_api(case, name=u"example", +def make_example_external_api(case, name="example", endpoint_templates=None, set_enabled=None, service_type=None): diff --git a/mimic/test/fixtures.py b/mimic/test/fixtures.py index 8e5f5508b0..956bf18129 100644 --- a/mimic/test/fixtures.py +++ b/mimic/test/fixtures.py @@ -2,7 +2,7 @@ Define fixtures to provide common functionality for Mimic testing """ -from __future__ import absolute_import, division, unicode_literals + from mimic.test.helpers import json_request from mimic.core import MimicCore diff --git a/mimic/test/helpers.py b/mimic/test/helpers.py index dc4d746697..934b77db88 100644 --- a/mimic/test/helpers.py +++ b/mimic/test/helpers.py @@ -2,7 +2,7 @@ Helper objects for tests, mostly to allow testing HTTP routes. """ -from __future__ import print_function, unicode_literals + import json @@ -163,7 +163,7 @@ def request(testCase, rootResource, method, uri, body=b"", # resource no matter what if headers is not None: headers_object = Headers() - for key, value in headers.items(): + for key, value in list(headers.items()): headers_object.setRawHeaders(key, value) else: headers_object = None @@ -258,7 +258,7 @@ def get_template_id(case, eeapi): :returns: template id value """ id_key = None - for k in eeapi.endpoint_templates.keys(): + for k in list(eeapi.endpoint_templates.keys()): id_key = k case.assertIsNotNone(id_key) return id_key diff --git a/mimic/test/test_catalog.py b/mimic/test/test_catalog.py index b55c7e9070..30074d368d 100644 --- a/mimic/test/test_catalog.py +++ b/mimic/test/test_catalog.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase @@ -10,9 +10,9 @@ class CatalogEntry(SynchronousTestCase): Testing of the :class:`Entry` object """ def setUp(self): - self.tenant = u"some-tenant" - self.service_type = u"some-type" - self.service_name = u"some-service" + self.tenant = "some-tenant" + self.service_type = "some-type" + self.service_name = "some-service" def test_basic(self): """ @@ -39,12 +39,12 @@ class CatalogEndpoint(SynchronousTestCase): Testing of the :class:`Endpoint` object """ def setUp(self): - self.tenant = u"some-tenant" - self.region = u"some-region" - self.endpointid = u"some-endpoint-id" - self.internal_api_prefix = u"endpoint-api" - self.request_prefix = u"http://internal.api/prefix" - self.external_api_url = u"http://external.api/endpoint" + self.tenant = "some-tenant" + self.region = "some-region" + self.endpointid = "some-endpoint-id" + self.internal_api_prefix = "endpoint-api" + self.request_prefix = "http://internal.api/prefix" + self.external_api_url = "http://external.api/endpoint" def test_basic(self): """ diff --git a/mimic/test/test_cinder.py b/mimic/test/test_cinder.py index fb0042f90b..22b6887c28 100644 --- a/mimic/test/test_cinder.py +++ b/mimic/test/test_cinder.py @@ -2,7 +2,7 @@ Tests for cinder api """ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase from mimic.test.helpers import json_request from mimic.rest.cinder_api import CinderApi diff --git a/mimic/test/test_cloudfeeds_int.py b/mimic/test/test_cloudfeeds_int.py index 110eabc5f3..473473ce42 100644 --- a/mimic/test/test_cloudfeeds_int.py +++ b/mimic/test/test_cloudfeeds_int.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + from mimic.rest.cloudfeeds import (CloudFeedsApi, CloudFeedsControlApi) from mimic.test.fixtures import APIMockHelper @@ -28,7 +28,7 @@ def test_data_plane_access_should_404(self): self, self.root, b"GET", self.uri, ) resp = self.successResultOf(r) - self.assertEquals(resp.code, 404) + self.assertEqual(resp.code, 404) def test_control_plane_access_should_404(self): """ @@ -40,4 +40,4 @@ def test_control_plane_access_should_404(self): self, self.root, b"GET", self.ctrl_uri, ) resp = self.successResultOf(r) - self.assertEquals(resp.code, 404) + self.assertEqual(resp.code, 404) diff --git a/mimic/test/test_cloudfeeds_unit.py b/mimic/test/test_cloudfeeds_unit.py index 2d13f984b1..193675fb00 100644 --- a/mimic/test/test_cloudfeeds_unit.py +++ b/mimic/test/test_cloudfeeds_unit.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + from mimic.model import cloudfeeds from twisted.trial.unittest import SynchronousTestCase @@ -13,14 +13,14 @@ def test_creation(self): """ A new CloudFeeds plugin should have no products when created. """ - self.assertEquals(len(self.cf.get_product_endpoints()), 0) + self.assertEqual(len(self.cf.get_product_endpoints()), 0) def test_product_registration(self): """ Registering a new product should create a new ATOM feed. """ self.cf.register_product(title='The hoohaw product.', href='hoohaw') - self.assertEquals(len(self.cf.get_product_endpoints()), 1) + self.assertEqual(len(self.cf.get_product_endpoints()), 1) def test_product_reregistration(self): """ @@ -28,9 +28,9 @@ def test_product_reregistration(self): """ self.cf.register_product(title='The hoohaw product', href='hoohaw') self.cf.register_product(title='The OTHER hoohaw product', href='hoohaw') - self.assertEquals(len(self.cf.get_product_endpoints()), 1) + self.assertEqual(len(self.cf.get_product_endpoints()), 1) p = self.cf.get_product_by_href('hoohaw') - self.assertEquals(p.title, 'The hoohaw product') + self.assertEqual(p.title, 'The hoohaw product') def test_get_products(self): """ @@ -40,11 +40,11 @@ def test_get_products(self): self.cf.register_product(title='The hoohaw product', href='hoohaw') self.cf.register_product(title='The goober product', href='goober') products = self.cf.get_product_endpoints() - self.assertEquals('hoohaw' in products, True) - self.assertEquals(products['hoohaw'].title, 'The hoohaw product') - self.assertEquals(products['goober'].title, 'The goober product') - self.assertEquals(products['hoohaw'].href, 'hoohaw') - self.assertEquals(products['goober'].href, 'goober') + self.assertEqual('hoohaw' in products, True) + self.assertEqual(products['hoohaw'].title, 'The hoohaw product') + self.assertEqual(products['goober'].title, 'The goober product') + self.assertEqual(products['hoohaw'].href, 'hoohaw') + self.assertEqual(products['goober'].href, 'goober') class TestCloudFeedsProduct(SynchronousTestCase): @@ -53,7 +53,7 @@ def test_creation(self): A new product queue should be empty. """ cfp = cloudfeeds.CloudFeedsProduct(title='title', href='href') - self.assertEquals(len(cfp.events), 0) + self.assertEqual(len(cfp.events), 0) def test_post(self): """ @@ -63,7 +63,7 @@ def test_post(self): cfp = cloudfeeds.CloudFeedsProduct(title='title', href='href') cfp.post("TROLOLOLOLOL!!!") cfp.post("This is a totally fake event-like thing.") - self.assertEquals( + self.assertEqual( cfp.events, ["TROLOLOLOLOL!!!", "This is a totally fake event-like thing."] ) @@ -86,7 +86,7 @@ def test_json_description(self): "title": Equals("title"), }), }) - self.assertEquals(productDescription.match(d), None) + self.assertEqual(productDescription.match(d), None) def test_json_product_list(self): """ @@ -117,7 +117,7 @@ def test_json_product_list(self): ), }) }) - self.assertEquals( + self.assertEqual( listing.match(cloudfeeds.render_product_endpoints_dict( cf.get_product_endpoints() )), diff --git a/mimic/test/test_core.py b/mimic/test/test_core.py index 4ad71dfd2e..634b0b7feb 100644 --- a/mimic/test/test_core.py +++ b/mimic/test/test_core.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import sys import uuid @@ -113,7 +113,7 @@ class CoreApiBuildingTests(SynchronousTestCase): Tests for creating a :class:`MimicCore` object with apis. """ def setUp(self): - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" def test_load_external_api(self): """ @@ -289,9 +289,9 @@ def test_service_with_region_external(self): self.assertIsNone( core.service_with_region( - u"EXTERNAL", - u"some-region-name", - u"http://some/random/prefix" + "EXTERNAL", + "some-region-name", + "http://some/random/prefix" ) ) @@ -310,9 +310,9 @@ def test_service_with_region_internal(self): service_id = a_service_id resource = core.service_with_region( - u"ORD", + "ORD", service_id, - u"http://some/random/prefix" + "http://some/random/prefix" ) self.assertTrue( IResource.providedBy(resource) @@ -335,7 +335,7 @@ def test_uri_for_service(self): base_uri = "http://some/random/prefix" uri = core.uri_for_service( - u"ORD", + "ORD", service_id, base_uri ) @@ -390,7 +390,7 @@ def test_entries_for_tenant_external_with_tenantid_replacement(self): ept_internal_url = "http://internal.url/v1/" + tenant_id ept_public_url = "http://public.url/v1/" + tenant_id - for ept in eeapi.endpoint_templates.values(): + for ept in list(eeapi.endpoint_templates.values()): ept.internal_url = "http://internal.url/v1/%tenant_id%" ept.public_url = "http://public.url/v1/%tenant_id%" @@ -510,12 +510,12 @@ def test_entries_for_tenant_external_multiple_regions(self): set_enabled=True ) eeapi2_name = "alternate-external-api" - eeapi2_template_id = u"uuid-alternate-endpoint-template" + eeapi2_template_id = "uuid-alternate-endpoint-template" eeapi2_template = exampleEndpointTemplate( name=eeapi2_name, endpoint_uuid=eeapi2_template_id, - region=u"NEW_REGION", - url=u"https://api.new_region.example.com:9090" + region="NEW_REGION", + url="https://api.new_region.example.com:9090" ) eeapi2 = make_example_external_api( self, diff --git a/mimic/test/test_customer.py b/mimic/test/test_customer.py index ec26fed625..9e2e515b60 100644 --- a/mimic/test/test_customer.py +++ b/mimic/test/test_customer.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import json diff --git a/mimic/test/test_decorators.py b/mimic/test/test_decorators.py index f78494637b..5b81336015 100644 --- a/mimic/test/test_decorators.py +++ b/mimic/test/test_decorators.py @@ -1,7 +1,7 @@ """ Test Decorators """ -from __future__ import absolute_import, division, unicode_literals + import json diff --git a/mimic/test/test_dns.py b/mimic/test/test_dns.py index f7d0b7d1cf..b0b3ef9eeb 100644 --- a/mimic/test/test_dns.py +++ b/mimic/test/test_dns.py @@ -2,7 +2,7 @@ Tests for dns api """ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase diff --git a/mimic/test/test_domain_mock.py b/mimic/test/test_domain_mock.py index 995c61c046..f42ba4229a 100644 --- a/mimic/test/test_domain_mock.py +++ b/mimic/test/test_domain_mock.py @@ -41,7 +41,7 @@ def test_domain_mock_with_an_example_mock(self): self, root, b"GET", "http://mybase/domain")) self.assertEqual(200, response.code) - self.assertEqual(content, [u'api.example.com']) + self.assertEqual(content, ['api.example.com']) def test_domain_mock_child(self): """ @@ -50,7 +50,7 @@ def test_domain_mock_child(self): ```` from its ``domain()`` method. """ example_domain_api = ExampleDomainAPI() - core = MimicCore(Clock(), [], [ExampleDomainAPI(u'api2.example.com', + core = MimicCore(Clock(), [], [ExampleDomainAPI('api2.example.com', b'"other-value"'), example_domain_api]) root = MimicRoot(core).app.resource() @@ -58,7 +58,7 @@ def test_domain_mock_child(self): self, root, b"GET", "http://mybase/domain/api.example.com/")) self.assertEqual(200, response.code) - self.assertEqual(content, u'test-value') + self.assertEqual(content, 'test-value') def test_domain_mock_no_child(self): """ diff --git a/mimic/test/test_external_api.py b/mimic/test/test_external_api.py index 8b3d7e4562..704851dbd0 100644 --- a/mimic/test/test_external_api.py +++ b/mimic/test/test_external_api.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + from six import text_type @@ -16,7 +16,7 @@ class TestValidationPoints(SynchronousTestCase): def setUp(self): - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" def test_external_api_no_service_resource(self): """ @@ -33,7 +33,7 @@ def test_external_api_no_service_resource(self): # Find the UUID of the registered External API eeapi_id = None - for uuid, api in self.core._uuid_to_api_external.items(): + for uuid, api in list(self.core._uuid_to_api_external.items()): eeapi_id = uuid self.assertIsNotNone(eeapi_id) @@ -49,7 +49,7 @@ class TestExternalApiMock(SynchronousTestCase): Test cases to verify the :obj:`IExternalAPIMock`. """ def setUp(self): - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name, @@ -86,7 +86,7 @@ def test_external_api_mock_in_service_catalog_with_tenantid(self): when enabled globally and taht the tenantid will be properly in the URL. """ - for ept in self.eeapi.endpoint_templates.values(): + for ept in list(self.eeapi.endpoint_templates.values()): ept.internal_url = "http://internal.url/v1/%tenant_id%" ept.public_url = "http://public.url/v1/%tenant_id%" @@ -109,8 +109,8 @@ class TestTenantSpecificAPIs(SynchronousTestCase): enabled for a specific tenant """ def setUp(self): - self.eeapi_name = u"externalServiceName" - self.eeapi_template_id = u"uuid-endpoint-template" + self.eeapi_name = "externalServiceName" + self.eeapi_template_id = "uuid-endpoint-template" self.eeapi_template = exampleEndpointTemplate( name=self.eeapi_name, endpoint_uuid=self.eeapi_template_id @@ -126,7 +126,7 @@ def setUp(self): self.root = self.helper.root self.uri = self.helper.uri - self.tenant_enabled_for = u"tenantWithApi" + self.tenant_enabled_for = "tenantWithApi" self.tenant_enabled_for_password = "udrowssap" self.tenant_data = TenantAuthentication( self, @@ -174,7 +174,7 @@ def test_multiple_endpoints_enabled_for_tenant(self): """ new_url = "https://api.new_region.example.com:9090" new_region = "NEW_REGION" - new_eeapi_template_id = u"uuid-alternate-endpoint-template" + new_eeapi_template_id = "uuid-alternate-endpoint-template" new_eeapi_template = exampleEndpointTemplate( name=self.eeapi_name, endpoint_uuid=new_eeapi_template_id, @@ -207,7 +207,7 @@ def test_multiple_endpoint_templates_only_one_enabled_for_tenant(self): """ new_url = "https://api.new_region.example.com:9090" new_region = "NEW_REGION" - new_eeapi_template_id = u"uuid-alternate-endpoint-template" + new_eeapi_template_id = "uuid-alternate-endpoint-template" new_eeapi_template = exampleEndpointTemplate( name=self.eeapi_name, endpoint_uuid=new_eeapi_template_id, @@ -231,7 +231,7 @@ class TestDualModeApiMock(SynchronousTestCase): Test cases to verify the :obj:`IExternalAPIMock`. """ def setUp(self): - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.ieapi = make_example_internal_api(self) self.eeapi = make_example_external_api( self, diff --git a/mimic/test/test_fastly.py b/mimic/test/test_fastly.py index 3ece806da2..7184d9aef8 100644 --- a/mimic/test/test_fastly.py +++ b/mimic/test/test_fastly.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase from twisted.internet.task import Clock diff --git a/mimic/test/test_flavors.py b/mimic/test/test_flavors.py index 96478bab52..b380b9f838 100644 --- a/mimic/test/test_flavors.py +++ b/mimic/test/test_flavors.py @@ -2,7 +2,7 @@ Tests for :mod:`nova_api` and :mod:`nova_objects` for flavors. """ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase diff --git a/mimic/test/test_glance.py b/mimic/test/test_glance.py index 5271f3f747..70c38f1a80 100644 --- a/mimic/test/test_glance.py +++ b/mimic/test/test_glance.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import treq import json @@ -40,9 +40,9 @@ def test_list_images(self): """ req = request(self, self.root, b"GET", self.uri + '/images', b'') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(True, 'images' in json.dumps(data)) + self.assertEqual(True, 'images' in json.dumps(data)) class GlanceAdminAPITests(SynchronousTestCase): diff --git a/mimic/test/test_heat.py b/mimic/test/test_heat.py index a5496cb7df..3b6dff56cc 100644 --- a/mimic/test/test_heat.py +++ b/mimic/test/test_heat.py @@ -53,7 +53,7 @@ def query_string(self, query_params=None): """ Util for building a query string from a parameter mapping. """ - return ('?' + '&'.join([k + '=' + v for (k, v) in query_params.items()]) + return ('?' + '&'.join([k + '=' + v for (k, v) in list(query_params.items())]) if query_params else '') def list_stacks(self, query_params=None): @@ -349,16 +349,16 @@ def test_template_validate(self): requests = dict( (key, request(self, self.root, b"POST", self.uri + '/validate', body=json.dumps(body).encode("utf-8"))) - for (key, body) in req_bodies.items() + for (key, body) in list(req_bodies.items()) ) responses = dict( - (key, self.successResultOf(req)) for (key, req) in requests.items() + (key, self.successResultOf(req)) for (key, req) in list(requests.items()) ) resp_bodies = dict( (key, self.get_responsebody(resp)) - for (key, resp) in responses.items() if key != 'wrong') + for (key, resp) in list(responses.items()) if key != 'wrong') self.assertEqual(responses['url'].code, 200) self.assertEqual(responses['inline'].code, 200) diff --git a/mimic/test/test_identity.py b/mimic/test/test_identity.py index af1fec918c..c6c992733b 100644 --- a/mimic/test/test_identity.py +++ b/mimic/test/test_identity.py @@ -2,7 +2,7 @@ Tests for identity model objects. """ -from __future__ import absolute_import, division, unicode_literals + import json diff --git a/mimic/test/test_identity_auth.py b/mimic/test/test_identity_auth.py index 9a8b691be8..ef08557c4f 100644 --- a/mimic/test/test_identity_auth.py +++ b/mimic/test/test_identity_auth.py @@ -3,7 +3,7 @@ :mod:`mimic.rest.identity_api`) """ -from __future__ import absolute_import, division, unicode_literals + import json @@ -783,7 +783,7 @@ def test_osksadm_credentials_list(self): self.assertEqual(len(credential), 1) # however, it's more compact to validate it this way: - for k, v in credential.items(): + for k, v in list(credential.items()): self.assertEqual(v['username'], username) self.assertEqual( len(v[credential_types[k]['value']]), @@ -1359,7 +1359,7 @@ def validate_injected_behavior(self, name_and_params, response, body): Given the behavior that is expected, validate the response and body. """ name, params = name_and_params - self.test_case.assertEquals(response.code, params['code']) + self.test_case.assertEqual(response.code, params['code']) if params['code'] == 500: expected = {"identityFault": {"message": "Auth failure", "code": 500}} @@ -1367,13 +1367,13 @@ def validate_injected_behavior(self, name_and_params, response, body): expected = {"unauthorized": {"message": "Invalid creds", "code": 403}} - self.test_case.assertEquals(body, expected) + self.test_case.assertEqual(body, expected) def validate_default_behavior(self, response, body): """ Validate the response and body of a successful server create. """ - self.test_case.assertEquals(response.code, 200) + self.test_case.assertEqual(response.code, 200) self.test_case.assertIn('access', body) diff --git a/mimic/test/test_identity_model.py b/mimic/test/test_identity_model.py index b651d84a3d..5d845745ed 100644 --- a/mimic/test/test_identity_model.py +++ b/mimic/test/test_identity_model.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import ddt from twisted.trial.unittest import SynchronousTestCase diff --git a/mimic/test/test_identity_objects.py b/mimic/test/test_identity_objects.py index a1879f04ee..8723525334 100644 --- a/mimic/test/test_identity_objects.py +++ b/mimic/test/test_identity_objects.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import ddt @@ -158,7 +158,7 @@ def test_serialize_basic(self): epts.type_key = data['type'] epts.name_key = data['name'] serialized_data = epts.serialize() - for k, v in serialized_data.items(): + for k, v in list(serialized_data.items()): if k not in data: self.assertIsNone(v) else: @@ -270,7 +270,7 @@ class EndpointTemplatesTests(SynchronousTestCase): Test Endpoint Template Functionality: list, add, has, update, remove. """ def setUp(self): - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" def test_listing_templates(self): """ @@ -370,7 +370,7 @@ def test_duplicate_api_insertion_fails(self): ) new_url = "https://api.new_region.example.com:9090" new_region = "NEW_REGION" - new_eeapi_template_id = u"uuid-alternate-endpoint-template" + new_eeapi_template_id = "uuid-alternate-endpoint-template" new_eeapi_template = exampleEndpointTemplate( name=self.eeapi_name, endpoint_uuid=new_eeapi_template_id, @@ -396,7 +396,7 @@ def test_add_template_with_mismatching_service_type(self): ) new_url = "https://api.new_region.example.com:9090" new_region = "NEW_REGION" - new_eeapi_template_id = u"uuid-alternate-endpoint-template" + new_eeapi_template_id = "uuid-alternate-endpoint-template" new_eeapi_template = exampleEndpointTemplate( name=self.eeapi_name, endpoint_uuid=new_eeapi_template_id, @@ -430,7 +430,7 @@ def test_update_endpoint_template(self): Validate that an endpoint template can be updated provided that the id field matches. """ - eeapi_template_id = u"uuid-alternate-endpoint-template" + eeapi_template_id = "uuid-alternate-endpoint-template" new_url = "https://api.new_region.example.com:9090" new_region = "NEW_REGION" @@ -466,7 +466,7 @@ def test_update_endpoint_template_invalid(self): """ new_url = "https://api.new_region.example.com:9090" new_region = "NEW_REGION" - new_eeapi_template_id = u"uuid-alternate-endpoint-template" + new_eeapi_template_id = "uuid-alternate-endpoint-template" new_eeapi_template = exampleEndpointTemplate( name=self.eeapi_name, endpoint_uuid=new_eeapi_template_id, @@ -510,7 +510,7 @@ def test_update_endpoint_template_invalid_data(self, invalid_data, expected_exce new_eeapi_template.type_key = "some-other-type" elif invalid_data == 'id': eeapi.endpoint_templates[new_id].id_key = \ - u"uuid-alternate-endpoint-template" + "uuid-alternate-endpoint-template" with self.assertRaises(expected_exception): eeapi.update_template(new_eeapi_template) @@ -545,7 +545,7 @@ def test_remove_endpoint_template(self, template_is_valid): Validate that an endpoint template can be removed from the :obj:`ExternalApiStore`. """ - eeapi_template_id = u"uuid-alternate-endpoint-template" + eeapi_template_id = "uuid-alternate-endpoint-template" eeapi_template = None if template_is_valid: eeapi_template = [ @@ -574,7 +574,7 @@ def test_remove_endpoint_template_with_user_registration(self): Validate that an endpoint template can be removed even if it enabled for a specific tenant. """ - eeapi_template_id = u"uuid-alternate-endpoint-template" + eeapi_template_id = "uuid-alternate-endpoint-template" eeapi_template = exampleEndpointTemplate( name=self.eeapi_name, endpoint_uuid=eeapi_template_id @@ -599,8 +599,8 @@ def test_remove_endpoint_template_with_user_registration_alternate(self): Validate that only the endpoint template that is suppose to be removed is removed. """ - eeapi_template_id = u"uuid-alternate-endpoint-template" - alternate_eeapi_template_id = u"uuid-alternate-endpoint-template-alt" + eeapi_template_id = "uuid-alternate-endpoint-template" + alternate_eeapi_template_id = "uuid-alternate-endpoint-template-alt" eeapi_template = exampleEndpointTemplate( name=self.eeapi_name, endpoint_uuid=eeapi_template_id @@ -639,7 +639,7 @@ class EndpointsForTenantsTests(SynchronousTestCase): Tests for functionality specific to tenants """ def setUp(self): - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" def test_invalid_template_endpoint_enable(self): """ @@ -682,7 +682,7 @@ def test_disable_endpoint_template_for_tenant(self): """ new_url = "https://api.new_region.example.com:9090" new_region = "NEW_REGION" - new_eeapi_template_id = u"uuid-alternate-endpoint-template" + new_eeapi_template_id = "uuid-alternate-endpoint-template" new_eeapi_template = exampleEndpointTemplate( name=self.eeapi_name, endpoint_uuid=new_eeapi_template_id, @@ -726,7 +726,7 @@ class EndpointTemplateOperationsTests(SynchronousTestCase): Operational tests for endpoint templates via :obj:`ExternalApiStore`. """ def setUp(self): - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" def test_uri_for_service_with_invalid_region(self): """ diff --git a/mimic/test/test_identity_osksadm.py b/mimic/test/test_identity_osksadm.py index 8779a7a044..9d46d27fc8 100644 --- a/mimic/test/test_identity_osksadm.py +++ b/mimic/test/test_identity_osksadm.py @@ -2,7 +2,7 @@ Tests for mimic identity :mod:`mimic.rest.identity_api` """ -from __future__ import absolute_import, division, unicode_literals + import json import uuid @@ -30,7 +30,7 @@ def setUp(self): self.core = MimicCore(Clock(), []) self.root = MimicRoot(self.core).app.resource() self.uri = "/identity/v2.0/services" - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.headers = { b'X-Auth-Token': [b'ABCDEF987654321'] } @@ -95,7 +95,7 @@ def setUp(self): self.core = MimicCore(Clock(), []) self.root = MimicRoot(self.core).app.resource() self.uri = "/identity/v2.0/services" - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name, @@ -201,9 +201,9 @@ class TestIdentityMimicOSKSCatalogAdminDeleteExternalService(SynchronousTestCase def setUp(self): self.core = MimicCore(Clock(), []) self.root = MimicRoot(self.core).app.resource() - self.eeapi_id = u"some-id" + self.eeapi_id = "some-id" self.uri = "/identity/v2.0/services/" + self.eeapi_id - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name, diff --git a/mimic/test/test_identity_oskscatalog.py b/mimic/test/test_identity_oskscatalog.py index bd89d1b8d4..303320b4d8 100644 --- a/mimic/test/test_identity_oskscatalog.py +++ b/mimic/test/test_identity_oskscatalog.py @@ -2,7 +2,7 @@ Tests for mimic identity :mod:`mimic.rest.identity_api` """ -from __future__ import absolute_import, division, unicode_literals + import json import uuid @@ -33,7 +33,7 @@ def setUp(self): self.core = MimicCore(Clock(), []) self.root = MimicRoot(self.core).app.resource() self.uri = "/identity/v2.0/OS-KSCATALOG/endpointTemplates" - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name, @@ -144,7 +144,7 @@ def setUp(self): self.core = MimicCore(Clock(), []) self.root = MimicRoot(self.core).app.resource() self.uri = "/identity/v2.0/OS-KSCATALOG/endpointTemplates" - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name, @@ -323,7 +323,7 @@ class TestIdentityOSKSCatalogAdminEndpointTemplatesUpdate( def setUp(self): self.core = MimicCore(Clock(), []) self.root = MimicRoot(self.core).app.resource() - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name, @@ -532,7 +532,7 @@ class TestIdentityOSKSCatalogAdminEndpointTemplatesDelete(SynchronousTestCase, I def setUp(self): self.core = MimicCore(Clock(), []) self.root = MimicRoot(self.core).app.resource() - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name, diff --git a/mimic/test/test_identity_oskscatalog_per_tenant.py b/mimic/test/test_identity_oskscatalog_per_tenant.py index 8a05ef8e4b..530f0da7ac 100644 --- a/mimic/test/test_identity_oskscatalog_per_tenant.py +++ b/mimic/test/test_identity_oskscatalog_per_tenant.py @@ -2,7 +2,7 @@ Tests for mimic identity :mod:`mimic.rest.identity_api` """ -from __future__ import absolute_import, division, unicode_literals + import json import uuid @@ -36,7 +36,7 @@ def setUp(self): "/identity/v2.0/tenants/" + self.tenant_id + "/OS-KSCATALOG/endpoints" ) - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name, @@ -160,7 +160,7 @@ def setUp(self): "/identity/v2.0/tenants/" + self.tenant_id + "/OS-KSCATALOG/endpoints" ) - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name, @@ -272,7 +272,7 @@ def setUp(self): self.tenant_id = 'some_tenant' self.core = MimicCore(Clock(), []) self.root = MimicRoot(self.core).app.resource() - self.eeapi_name = u"externalServiceName" + self.eeapi_name = "externalServiceName" self.eeapi = make_example_external_api( self, name=self.eeapi_name diff --git a/mimic/test/test_ironic.py b/mimic/test/test_ironic.py index 4eacdcca65..df540752b6 100644 --- a/mimic/test/test_ironic.py +++ b/mimic/test/test_ironic.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import json from uuid import uuid4 @@ -89,7 +89,7 @@ def test_create_node(self): Create node returns 201 and the newly created node. """ new_node = self.create_node(self.create_request) - for key in self.create_request.keys(): + for key in list(self.create_request.keys()): self.assertEqual(self.create_request[key], new_node[key]) def test_create_node_failure(self): @@ -248,7 +248,7 @@ def test_list_node_details_for_onmetal_flavors(self): for each in content['nodes']: if each['properties']['memory_mb']: self.assertTrue( - (each['extra']['flavor'] in expected_flavor_memory.keys()) and + (each['extra']['flavor'] in list(expected_flavor_memory.keys())) and (each['properties']['memory_mb'] == expected_flavor_memory[each['extra']['flavor']])) def _validate_provisioning(self, new_provision_state): diff --git a/mimic/test/test_keypairs.py b/mimic/test/test_keypairs.py index 11f87856f5..a4ab1fa92f 100644 --- a/mimic/test/test_keypairs.py +++ b/mimic/test/test_keypairs.py @@ -2,7 +2,7 @@ Tests for :mod:`nova_api` and :mod:`nova_objects`. """ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase diff --git a/mimic/test/test_loadbalancer.py b/mimic/test/test_loadbalancer.py index 5d792102f8..43aca12056 100644 --- a/mimic/test/test_loadbalancer.py +++ b/mimic/test/test_loadbalancer.py @@ -2,7 +2,7 @@ Unit tests for the """ -from __future__ import absolute_import, division, unicode_literals + import json import treq @@ -763,7 +763,7 @@ def _create_nodes(self, addresses): responses = [self.successResultOf(response) for response in responses] response_bodies = [self.successResultOf(treq.json_content(response)) for response in responses] - return zip(responses, response_bodies) + return list(zip(responses, response_bodies)) def _get_nodes(self, lb_id): """Get all the nodes in a LB.""" @@ -1166,7 +1166,7 @@ def test_bulk_delete_nonexistent_nodes(self): ) # and the one valid node that we tried to delete is still there remaining = [node['id'] for node in self._get_nodes(self.lb_id)] - self.assertEquals(remaining, [self.node[0]['id']]) + self.assertEqual(remaining, [self.node[0]['id']]) def test_bulk_delete_above_batch_limit(self): """ @@ -1199,7 +1199,7 @@ def test_bulk_delete_above_batch_limit(self): ) # Existing nodes are not touched existing = [node['id'] for node in self._get_nodes(self.lb_id)] - self.assertEquals(existing, node_ids) + self.assertEqual(existing, node_ids) def test_bulk_delete_limit_after_node_validation(self): """ @@ -1207,9 +1207,9 @@ def test_bulk_delete_limit_after_node_validation(self): i.e. nodes given should be valid before their count is checked """ response, body = _bulk_delete( - self, self.root, self.uri, self.lb_id, range(1, 12)) + self, self.root, self.uri, self.lb_id, list(range(1, 12))) self.assertEqual(response.code, 400) - ids = ",".join(map(str, range(1, 12))) + ids = ",".join(map(str, list(range(1, 12)))) self.assertEqual( body, { @@ -1354,7 +1354,7 @@ def test_updating_node_success(self): } expected.update(change) # sanity check to make sure we're actually changing stuff - self.assertTrue(all([change[k] != original[k] for k in change.keys()])) + self.assertTrue(all([change[k] != original[k] for k in list(change.keys())])) resp, body = _update_clb_node( self, self.helper, self.lb_id, self.node[0]["id"], json.dumps({"node": change}).encode("utf-8"), @@ -1670,7 +1670,7 @@ def test_bulk_delete_not_active(self): self.assertEqual(response.code, 422) self.assertEqual( body, - {u'message': u'LoadBalancer is not ACTIVE', u'code': 422}) + {'message': 'LoadBalancer is not ACTIVE', 'code': 422}) def test_updating_node_loadbalancer_state(self): """ diff --git a/mimic/test/test_maas.py b/mimic/test/test_maas.py index 342e252c41..e679671d73 100644 --- a/mimic/test/test_maas.py +++ b/mimic/test/test_maas.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + from six import text_type import json @@ -81,9 +81,9 @@ def createEntity(self, label): req = request(self, self.root, b"POST", self.uri + '/entities', json.dumps(postdata).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) entity_id, location = id_and_location(resp) - self.assertEquals(location, self.uri + '/entities/' + entity_id) + self.assertEqual(location, self.uri + '/entities/' + entity_id) return resp def createCheck(self, label, entity_id, is_remote=True): @@ -110,9 +110,9 @@ def createCheck(self, label, entity_id, is_remote=True): req = request(self, self.root, b"POST", checks_endpoint, json.dumps(postdata).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) check_id, location = id_and_location(resp) - self.assertEquals(location, checks_endpoint + '/' + check_id) + self.assertEqual(location, checks_endpoint + '/' + check_id) return resp def createAlarm(self, label, entity_id, check_id): @@ -127,9 +127,9 @@ def createAlarm(self, label, entity_id, check_id): req = request(self, self.root, b"POST", alarms_endpoint, json.dumps(postdata).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) alarm_id, location = id_and_location(resp) - self.assertEquals(location, alarms_endpoint + '/' + alarm_id) + self.assertEqual(location, alarms_endpoint + '/' + alarm_id) return resp def createNotification(self, label): @@ -144,9 +144,9 @@ def createNotification(self, label): json.dumps(postdata).encode("utf-8") ) resp = self.successResultOf(req) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) nt_id, location = id_and_location(resp) - self.assertEquals(location, self.uri + '/notifications/' + nt_id) + self.assertEqual(location, self.uri + '/notifications/' + nt_id) return resp def createNotificationPlan(self, label): @@ -159,9 +159,9 @@ def createNotificationPlan(self, label): json.dumps(postdata).encode("utf-8") ) resp = self.successResultOf(req) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) np_id, location = id_and_location(resp) - self.assertEquals(location, self.uri + '/notification_plans/' + np_id) + self.assertEqual(location, self.uri + '/notification_plans/' + np_id) return resp def createSuppression(self, label): @@ -171,9 +171,9 @@ def createSuppression(self, label): json.dumps(postdata).encode("utf-8") ) resp = self.successResultOf(req) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) sp_id, location = id_and_location(resp) - self.assertEquals(location, self.uri + '/suppressions/' + sp_id) + self.assertEqual(location, self.uri + '/suppressions/' + sp_id) return resp def getXobjectIDfromResponse(self, resp): @@ -230,14 +230,14 @@ def test_list_entity(self): self.createEntity('entity-2') (resp, data) = self.successResultOf(json_request( self, self.root, b"GET", '{0}/entities?limit=1'.format(self.uri))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['values'][0]['label'], 'ItsAnEntity') + self.assertEqual(resp.code, 200) + self.assertEqual(data['values'][0]['label'], 'ItsAnEntity') (resp, data) = self.successResultOf(json_request( self, self.root, b"GET", '{0}/entities?marker={1}'.format( self.uri, data['metadata']['next_marker']))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['values'][0]['label'], 'entity-2') + self.assertEqual(resp.code, 200) + self.assertEqual(data['values'][0]['label'], 'entity-2') def test_list_entity_pagination_marker_not_found(self): """ @@ -247,8 +247,8 @@ def test_list_entity_pagination_marker_not_found(self): (resp, data) = self.successResultOf(json_request( self, self.root, b"GET", '{0}/entities?marker=enDoesNotExist'.format( self.uri))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['values'][0]['label'], 'ItsAnEntity') + self.assertEqual(resp.code, 200) + self.assertEqual(data['values'][0]['label'], 'ItsAnEntity') def test_get_entity(self): """ @@ -256,9 +256,9 @@ def test_get_entity(self): """ req = request(self, self.root, b"GET", self.uri + '/entities/' + self.entity_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(self.entity_id, data['id']) + self.assertEqual(self.entity_id, data['id']) def test_fail_get_entity(self): """ @@ -266,8 +266,8 @@ def test_fail_get_entity(self): """ (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/entities/whatever'.format(self.uri))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['type'], 'notFoundError') + self.assertEqual(resp.code, 404) + self.assertEqual(data['type'], 'notFoundError') def test_list_audits(self): """ @@ -275,18 +275,18 @@ def test_list_audits(self): """ req = request(self, self.root, b"GET", self.uri + '/audits?limit=2') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['metadata']['count'], 2) - self.assertEquals(data['values'][0]['app'], 'entities') + self.assertEqual(data['metadata']['count'], 2) + self.assertEqual(data['values'][0]['app'], 'entities') req = request(self, self.root, b"GET", self.uri + '/audits?marker=' + data['metadata']['next_marker']) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['metadata']['count'], 4) - self.assertEquals(data['values'][0]['app'], 'alarms') + self.assertEqual(data['metadata']['count'], 4) + self.assertEqual(data['values'][0]['app'], 'alarms') def test_list_audits_reverse(self): """ @@ -294,10 +294,10 @@ def test_list_audits_reverse(self): """ req = request(self, self.root, b"GET", self.uri + '/audits?limit=2&reverse=true') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['metadata']['count'], 2) - self.assertEquals(data['values'][0]['app'], 'suppressions') + self.assertEqual(data['metadata']['count'], 2) + self.assertEqual(data['values'][0]['app'], 'suppressions') def test_list_audits_marker_not_found(self): """ @@ -307,9 +307,9 @@ def test_list_audits_marker_not_found(self): req = request(self, self.root, b"GET", self.uri + '/audits?marker=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['values'][0]['app'], 'entities') + self.assertEqual(data['values'][0]['app'], 'entities') def test_get_check(self): """ @@ -318,9 +318,9 @@ def test_get_check(self): req = request(self, self.root, b"GET", self.uri + '/entities/' + self.entity_id + '/checks/' + self.check_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(self.check_id, data['id']) + self.assertEqual(self.check_id, data['id']) def test_get_missing_check_404s(self): """ @@ -329,8 +329,8 @@ def test_get_missing_check_404s(self): (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/entities/{1}/checks/Whut'.format( self.uri, self.entity_id))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['type'], 'notFoundError') + self.assertEqual(resp.code, 404) + self.assertEqual(data['type'], 'notFoundError') def test_get_checks_for_entity(self): """ @@ -339,10 +339,10 @@ def test_get_checks_for_entity(self): req = request(self, self.root, b"GET", self.uri + '/entities/' + self.entity_id + '/checks') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(1, data['metadata']['count']) - self.assertEquals(self.check_id, data['values'][0]['id']) + self.assertEqual(1, data['metadata']['count']) + self.assertEqual(self.check_id, data['values'][0]['id']) def test_get_checks_for_missing_entity(self): """ @@ -351,8 +351,8 @@ def test_get_checks_for_missing_entity(self): (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/entities/enDoesNotExist/checks'.format( self.uri))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['message'], 'Parent does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['message'], 'Parent does not exist') def test_create_check_missing_type_400s(self): """ @@ -363,9 +363,9 @@ def test_create_check_missing_type_400s(self): json_request(self, self.root, b"POST", '{0}/entities/{1}/checks'.format(self.uri, self.entity_id), json.dumps({'label': 'wow-check'}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['type'], 'badRequest') - self.assertEquals(data['message'], 'Validation error for key \'type\'') + self.assertEqual(resp.code, 400) + self.assertEqual(data['type'], 'badRequest') + self.assertEqual(data['message'], 'Validation error for key \'type\'') def test_create_check_on_missing_entity_404s(self): """ @@ -376,8 +376,8 @@ def test_create_check_on_missing_entity_404s(self): json_request(self, self.root, b"POST", '{0}/entities/enDoesNotExist/checks'.format(self.uri), json.dumps({'label': 'a', 'type': 'agent.cpu'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['type'], 'notFoundError') + self.assertEqual(resp.code, 404) + self.assertEqual(data['type'], 'notFoundError') def test_create_entity_with_unrecognized_keys(self): """ @@ -388,7 +388,7 @@ def test_create_entity_with_unrecognized_keys(self): resp = self.successResultOf( request(self, self.root, b"POST", '{0}/entities'.format(self.uri), json.dumps({'label': 'foo', 'whut': 'WAT'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) def test_update_entity(self): """ @@ -403,20 +403,20 @@ def test_update_entity(self): self.uri, self.entity_id) req = request(self, self.root, b"GET", entity_endpoint) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) data['label'] = 'Iamamwhoami' req = request(self, self.root, b"PUT", entity_endpoint, json.dumps(data).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) - self.assertEquals(entity_endpoint, one_text_header(resp, b'location')) + self.assertEqual(resp.code, 204) + self.assertEqual(entity_endpoint, one_text_header(resp, b'location')) req = request(self, self.root, b"GET", entity_endpoint) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals('Iamamwhoami', data['label']) - self.assertEquals( + self.assertEqual('Iamamwhoami', data['label']) + self.assertEqual( 'ItsAnEntity', self.get_responsebody(self.successResultOf( request(self, self.root, b"GET", other_entity_endpoint) @@ -431,8 +431,8 @@ def test_update_nonexisting_entity_404s(self): json_request(self, self.root, b"PUT", '{0}/entities/enDoesNotExist'.format(self.uri), json.dumps({'label': 'wow entity'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['message'], 'Object does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['message'], 'Object does not exist') def test_partial_update_entity(self): """ @@ -442,13 +442,13 @@ def test_partial_update_entity(self): req = request(self, self.root, b"PUT", self.uri + '/entities/' + self.entity_id, json.dumps(data).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/entities/' + self.entity_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals('ag13378901234', data['agent_id']) - self.assertEquals('ItsAnEntity', data['label']) + self.assertEqual('ag13378901234', data['agent_id']) + self.assertEqual('ItsAnEntity', data['label']) def test_get_alarm(self): """ @@ -459,9 +459,9 @@ def test_get_alarm(self): req = request(self, self.root, b"GET", self.uri + '/entities/' + self.entity_id + '/alarms/' + self.alarm_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(self.alarm_id, data['id']) + self.assertEqual(self.alarm_id, data['id']) def test_get_nonexistent_alarm(self): """ @@ -470,7 +470,7 @@ def test_get_nonexistent_alarm(self): req = request(self, self.root, b"GET", self.uri + '/entities/' + self.entity_id + '/alarms/alDoesNotExist') resp = self.successResultOf(req) - self.assertEquals(resp.code, 404) + self.assertEqual(resp.code, 404) def test_create_alarm_missing_check_id_400s(self): """ @@ -482,9 +482,9 @@ def test_create_alarm_missing_check_id_400s(self): '{0}/entities/{1}/alarms'.format(self.uri, self.entity_id), json.dumps({'label': 'wow-alarm', 'notification_plan_id': self.np_id}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['type'], 'badRequest') - self.assertEquals(data['message'], 'Validation error for key \'check_id\'') + self.assertEqual(resp.code, 400) + self.assertEqual(data['type'], 'badRequest') + self.assertEqual(data['message'], 'Validation error for key \'check_id\'') def test_create_alarm_missing_np_id_400s(self): """ @@ -496,9 +496,9 @@ def test_create_alarm_missing_np_id_400s(self): '{0}/entities/{1}/alarms'.format(self.uri, self.entity_id), json.dumps({'label': 'wow-alarm', 'check_id': self.check_id}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['type'], 'badRequest') - self.assertEquals(data['message'], 'Validation error for key \'notification_plan_id\'') + self.assertEqual(resp.code, 400) + self.assertEqual(data['type'], 'badRequest') + self.assertEqual(data['message'], 'Validation error for key \'notification_plan_id\'') def test_update_check(self): """ @@ -508,18 +508,18 @@ def test_update_check(self): self.uri, self.entity_id, self.check_id) req = request(self, self.root, b"GET", check_endpoint) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) data['label'] = 'Iamamwhoami' req = request(self, self.root, b"PUT", check_endpoint, json.dumps(data).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) - self.assertEquals(check_endpoint, one_text_header(resp, b'location')) + self.assertEqual(resp.code, 204) + self.assertEqual(check_endpoint, one_text_header(resp, b'location')) req = request(self, self.root, b"GET", check_endpoint) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals('Iamamwhoami', data['label']) + self.assertEqual('Iamamwhoami', data['label']) def test_partial_update_check(self): """ @@ -530,14 +530,14 @@ def test_partial_update_check(self): self.uri + '/entities/' + self.entity_id + '/checks/' + self.check_id, json.dumps(data).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/entities/' + self.entity_id + '/checks/' + self.check_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals('internet7_v4', data['target_alias']) - self.assertEquals('ItsAcheck', data['label']) + self.assertEqual('internet7_v4', data['target_alias']) + self.assertEqual('ItsAcheck', data['label']) def test_update_nonexisting_check_404s(self): """ @@ -547,8 +547,8 @@ def test_update_nonexisting_check_404s(self): json_request(self, self.root, b"PUT", '{0}/entities/{1}/checks/chDoesNotExist'.format(self.uri, self.entity_id), json.dumps({'label': 'awesome test check'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['message'], 'Object does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['message'], 'Object does not exist') def test_create_check_with_unrecognized_keys(self): """ @@ -562,7 +562,7 @@ def test_create_check_with_unrecognized_keys(self): json.dumps({'label': 'check-foo', 'type': 'remote.ping', 'whut': 'WAT'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) def test_update_alarm(self): """ @@ -570,20 +570,20 @@ def test_update_alarm(self): """ req = request(self, self.root, b"GET", self.uri + '/views/overview') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) alarm = self.get_responsebody(resp)['values'][0]['alarms'][0] alarm['label'] = 'Iamamwhoami' alarm_endpoint = '{0}/entities/{1}/alarms/{2}'.format( self.uri, self.entity_id, self.alarm_id) req = request(self, self.root, b"PUT", alarm_endpoint, json.dumps(alarm).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) - self.assertEquals(alarm_endpoint, one_text_header(resp, b'location')) + self.assertEqual(resp.code, 204) + self.assertEqual(alarm_endpoint, one_text_header(resp, b'location')) req = request(self, self.root, b"GET", self.uri + '/views/overview') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) alarm2 = self.get_responsebody(resp)['values'][0]['alarms'][0] - self.assertEquals(alarm['label'], alarm2['label']) + self.assertEqual(alarm['label'], alarm2['label']) def test_partial_update_alarm(self): """ @@ -596,14 +596,14 @@ def test_partial_update_alarm(self): self.uri + '/entities/' + self.entity_id + '/alarms/' + self.alarm_id, json.dumps(data).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/entities/' + self.entity_id + '/alarms/' + self.alarm_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals('np123456', data['notification_plan_id']) - self.assertEquals('ItsAnAlarm', data['label']) + self.assertEqual('np123456', data['notification_plan_id']) + self.assertEqual('ItsAnAlarm', data['label']) def test_update_nonexisting_alarm(self): """ @@ -614,7 +614,7 @@ def test_update_nonexisting_alarm(self): '{0}/entities/{1}/alarms/alDoesNotExist'.format( self.uri, self.entity_id), json.dumps({'label': 'awesome test alarm'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) + self.assertEqual(resp.code, 404) def test_create_alarm_with_unrecognized_keys(self): """ @@ -630,7 +630,7 @@ def test_create_alarm_with_unrecognized_keys(self): 'criteria': 'return new AlarmStatus(OK);', 'notification_plan_id': 'npL01Wu7', 'whut': 'WAT'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) def test_create_alarm_missing_entity_404s(self): """ @@ -643,7 +643,7 @@ def test_create_alarm_missing_entity_404s(self): 'check_id': self.check_id, 'criteria': 'OK', 'notification_plan_id': 'npL01Wu7'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) + self.assertEqual(resp.code, 404) def test_delete_alarm(self): """ @@ -652,11 +652,11 @@ def test_delete_alarm(self): req = request(self, self.root, b"DELETE", self.uri + '/entities/' + self.entity_id + '/alarms/' + self.alarm_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/views/overview') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) - self.assertEquals(0, len(self.get_responsebody(resp)['values'][0]['alarms'])) + self.assertEqual(resp.code, 200) + self.assertEqual(0, len(self.get_responsebody(resp)['values'][0]['alarms'])) def test_delete_nonexistent_alarm_404s(self): """ @@ -665,8 +665,8 @@ def test_delete_nonexistent_alarm_404s(self): (resp, data) = self.successResultOf( json_request(self, self.root, b"DELETE", '{0}/entities/{1}/alarms/alWhut'.format(self.uri, self.entity_id))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['details'], + self.assertEqual(resp.code, 404) + self.assertEqual(data['details'], 'Object "Alarm" with key "{0}:alWhut" does not exist'.format(self.entity_id)) def test_test_check(self): @@ -677,8 +677,8 @@ def test_test_check(self): json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-check', json.dumps({'type': 'agent.disk'}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(1, len(data)) + self.assertEqual(resp.code, 200) + self.assertEqual(1, len(data)) self.assertIn('read_bytes', data[0]['metrics']) def test_test_check_setting_available(self): @@ -689,14 +689,14 @@ def test_test_check_setting_available(self): '{0}/entities/{1}/checks/test_responses/{2}'.format( self.ctl_uri, self.entity_id, 'agent.load_average'), json.dumps([{'available': False}]).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-check', json.dumps({'type': 'agent.load_average'}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(False, data[0]['available']) + self.assertEqual(resp.code, 200) + self.assertEqual(False, data[0]['available']) def test_test_check_setting_status(self): """ @@ -706,14 +706,14 @@ def test_test_check_setting_status(self): '{0}/entities/{1}/checks/test_responses/{2}'.format( self.ctl_uri, self.entity_id, 'agent.memory'), json.dumps([{'status': 'whuuut'}]).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-check', json.dumps({'type': 'agent.memory'}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals('whuuut', data[0]['status']) + self.assertEqual(resp.code, 200) + self.assertEqual('whuuut', data[0]['status']) def test_test_check_setting_metrics(self): """ @@ -727,30 +727,30 @@ def test_test_check_setting_metrics(self): self.ctl_uri, self.entity_id, 'remote.http'), json.dumps([{'metrics': {'duration': {'data': 123}}, 'monitoring_zone_id': 'mzdfw'}]).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-check', json.dumps({'type': 'remote.http', 'monitoring_zones_poll': ['mzdfw']}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(123, data[0]['metrics']['duration']['data']) + self.assertEqual(resp.code, 200) + self.assertEqual(123, data[0]['metrics']['duration']['data']) resp = self.successResultOf(request(self, self.root, b"PUT", '{0}/entities/{1}/checks/test_responses/{2}'.format( self.ctl_uri, self.entity_id, 'remote.http'), json.dumps([{'metrics': {'duration': {'data': 456}}, 'monitoring_zone_id': 'mzdfw'}]).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-check', json.dumps({'type': 'remote.http', 'monitoring_zones_poll': ['mzdfw']}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(456, data[0]['metrics']['duration']['data']) + self.assertEqual(resp.code, 200) + self.assertEqual(456, data[0]['metrics']['duration']['data']) def test_test_check_clears_metrics(self): """ @@ -766,19 +766,19 @@ def test_test_check_clears_metrics(self): '{0}/entities/{1}/checks/test_responses/{2}'.format( self.ctl_uri, self.entity_id, 'agent.filesystem'), json.dumps([{'metrics': {'options': options}}]).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) resp = self.successResultOf( request(self, self.root, b"DELETE", '{0}/entities/{1}/checks/test_responses/{2}'.format( self.ctl_uri, self.entity_id, 'agent.filesystem'))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-check', json.dumps({'type': 'agent.filesystem'}).encode("utf-8"))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) self.assertTrue(len(data[0]['metrics']['options']['data']) < 43) def test_test_check_empty_clear_does_nothing(self): @@ -790,13 +790,13 @@ def test_test_check_empty_clear_does_nothing(self): request(self, self.root, b"DELETE", '{0}/entities/{1}/checks/test_responses/{2}'.format( self.ctl_uri, self.entity_id, 'agent.network'))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-check', json.dumps({'type': 'agent.network'}).encode("utf-8"))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) self.assertIsInstance(data[0]['metrics']['rx_bytes']['data'], int) def test_test_check_other_types(self): @@ -808,8 +808,8 @@ def test_test_check_other_types(self): json_request(self, self.root, b"POST", '{0}/entities/{1}/test-check'.format(self.uri, self.entity_id), json.dumps({'type': check_type}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(1, len(data)) + self.assertEqual(resp.code, 200) + self.assertEqual(1, len(data)) self.assertTrue('metrics' in data[0]) def test_test_alarm(self): @@ -821,8 +821,8 @@ def test_test_alarm(self): self.uri + '/entities/' + self.entity_id + '/test-alarm', json.dumps({'criteria': 'return new AlarmStatus(OK).encode("utf-8");', 'check_data': [{}]}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(1, len(data)) + self.assertEqual(resp.code, 200) + self.assertEqual(1, len(data)) self.assertIn('state', data[0]) self.assertIn('status', data[0]) self.assertIn('timestamp', data[0]) @@ -835,16 +835,16 @@ def test_test_alarm_setting_state(self): '{0}/entities/{1}/alarms/test_response'.format( self.ctl_uri, self.entity_id), json.dumps([{'state': 'OK'}]).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-alarm', json.dumps({'criteria': 'return new AlarmStatus(OK).encode("utf-8");', 'check_data': [{}]}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(1, len(data)) - self.assertEquals('OK', data[0]['state']) + self.assertEqual(resp.code, 200) + self.assertEqual(1, len(data)) + self.assertEqual('OK', data[0]['state']) self.assertIn('timestamp', data[0]) def test_test_alarm_setting_status(self): @@ -857,16 +857,16 @@ def test_test_alarm_setting_status(self): self.ctl_uri, self.entity_id), json.dumps([{'state': 'OK', 'status': 'test status message'}]).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-alarm', json.dumps({'criteria': 'return new AlarmStatus(OK).encode("utf-8");', 'check_data': [{}]}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(1, len(data)) - self.assertEquals('test status message', data[0]['status']) + self.assertEqual(resp.code, 200) + self.assertEqual(1, len(data)) + self.assertEqual('test status message', data[0]['status']) def test_test_alarm_clearing_response(self): """ @@ -879,21 +879,21 @@ def test_test_alarm_clearing_response(self): self.ctl_uri, self.entity_id), json.dumps([{'state': 'OK', 'status': 'test-alarm working OK'}]).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) resp = self.successResultOf(request(self, self.root, b"DELETE", '{0}/entities/{1}/alarms/test_response'.format( self.ctl_uri, self.entity_id))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", self.uri + '/entities/' + self.entity_id + '/test-alarm', json.dumps({'criteria': 'return new AlarmStatus(OK).encode("utf-8");', 'check_data': [{}]}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(1, len(data)) - self.assertNotEquals('test-alarm working OK', data[0]['status']) + self.assertEqual(resp.code, 200) + self.assertEqual(1, len(data)) + self.assertNotEqual('test-alarm working OK', data[0]['status']) def test_test_alarm_setting_errors(self): """ @@ -911,30 +911,30 @@ def test_test_alarm_setting_errors(self): '{0}/entities/{1}/alarms/test_errors'.format( self.ctl_uri, self.entity_id), json.dumps({'code': 400, 'response': parse_error}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) resp = self.successResultOf( request(self, self.root, b"POST", '{0}/entities/{1}/alarms/test_errors'.format( self.ctl_uri, self.entity_id), json.dumps({'code': 404, 'response': not_found_error}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", '{0}/entities/{1}/test-alarm'.format(self.uri, self.entity_id), json.dumps({'criteria': 'return new AlarmStatus(OK).encode("utf-8");', 'check_data': [{}]}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data, parse_error) + self.assertEqual(resp.code, 400) + self.assertEqual(data, parse_error) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", '{0}/entities/{1}/test-alarm'.format(self.uri, self.entity_id), json.dumps({'criteria': 'return new AlarmStatus(OK).encode("utf-8");', 'check_data': [{}]}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data, not_found_error) + self.assertEqual(resp.code, 404) + self.assertEqual(data, not_found_error) def test_get_alarms_for_entity(self): """ @@ -943,10 +943,10 @@ def test_get_alarms_for_entity(self): req = request(self, self.root, b"GET", self.uri + '/entities/' + self.entity_id + '/alarms') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(1, data['metadata']['count']) - self.assertEquals(self.alarm_id, data['values'][0]['id']) + self.assertEqual(1, data['metadata']['count']) + self.assertEqual(self.alarm_id, data['values'][0]['id']) def test_get_alarms_for_missing_entity(self): """ @@ -955,8 +955,8 @@ def test_get_alarms_for_missing_entity(self): (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/entities/enDoesNotExist/alarms'.format(self.uri))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['message'], 'Parent does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['message'], 'Parent does not exist') def test_delete_check(self): """ @@ -965,13 +965,13 @@ def test_delete_check(self): req = request(self, self.root, b"DELETE", self.uri + '/entities/' + self.entity_id + '/checks/' + self.check_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/views/overview') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(0, len(data['values'][0]['checks'])) - self.assertEquals(0, len(data['values'][0]['alarms'])) + self.assertEqual(0, len(data['values'][0]['checks'])) + self.assertEqual(0, len(data['values'][0]['alarms'])) def test_delete_check_only_deletes_own_alarms(self): """ @@ -984,11 +984,11 @@ def test_delete_check_only_deletes_own_alarms(self): resp = self.successResultOf( request(self, self.root, b"DELETE", '{0}/entities/{1}/checks/{2}'.format(self.uri, self.entity_id, self.check_id))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) resp = self.successResultOf( request(self, self.root, b"GET", '{0}/entities/{1}/alarms/{2}'.format(self.uri, self.entity_id, other_alarm_id))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) def test_delete_nonexistent_check_404s(self): """ @@ -997,8 +997,8 @@ def test_delete_nonexistent_check_404s(self): (resp, data) = self.successResultOf( json_request(self, self.root, b"DELETE", '{0}/entities/{1}/checks/chWhut'.format(self.uri, self.entity_id))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['details'], + self.assertEqual(resp.code, 404) + self.assertEqual(data['details'], 'Object "Check" with key "{0}:chWhut" does not exist'.format(self.entity_id)) def test_delete_entity(self): @@ -1008,13 +1008,13 @@ def test_delete_entity(self): req = request(self, self.root, b"DELETE", self.uri + '/entities/' + self.entity_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/views/overview') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(0, len(data['values'])) - self.assertEquals(0, data['metadata']['count']) + self.assertEqual(0, len(data['values'])) + self.assertEqual(0, data['metadata']['count']) def test_delete_nonexistent_entity_404s(self): """ @@ -1022,15 +1022,15 @@ def test_delete_nonexistent_entity_404s(self): """ (resp, data) = self.successResultOf( json_request(self, self.root, b"DELETE", '{0}/entities/whut'.format(self.uri))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['details'], 'Object "Entity" with key "whut" does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['details'], 'Object "Entity" with key "whut" does not exist') def test_jsonhome(self): req = request(self, self.root, b"GET", self.uri + '/__experiments/json_home') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(True, 'mimicking' in json.dumps(data)) + self.assertEqual(True, 'mimicking' in json.dumps(data)) def test_notificationplan(self): """ @@ -1038,9 +1038,9 @@ def test_notificationplan(self): """ req = request(self, self.root, b"GET", self.uri + '/notification_plans') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(True, 'npTechnicalContactsEmail' in json.dumps(data)) + self.assertEqual(True, 'npTechnicalContactsEmail' in json.dumps(data)) def test_create_notification_plan_with_unrecognized_keys(self): """ @@ -1053,7 +1053,7 @@ def test_create_notification_plan_with_unrecognized_keys(self): '{0}/notification_plans'.format(self.uri), json.dumps({'label': 'np-foo', 'whut': 'WAT'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) def test_create_notification_with_unrecognized_keys(self): """ @@ -1068,7 +1068,7 @@ def test_create_notification_with_unrecognized_keys(self): 'details': {'address': 'bob@company.com'}, 'type': 'email', 'whut': 'WAT'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) def test_create_suppression_with_unrecognized_keys(self): """ @@ -1081,7 +1081,7 @@ def test_create_suppression_with_unrecognized_keys(self): '{0}/suppressions'.format(self.uri), json.dumps({'label': 'sp-foo', 'whut': 'WAT'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) def test_agenthostinfo(self): """ @@ -1091,21 +1091,21 @@ def test_agenthostinfo(self): json_request(self, self.root, b"GET", '{0}/views/agent_host_info?entityId={1}&include=system'.format( self.uri, self.entity_id))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['message'], 'Agent does not exist') + self.assertEqual(resp.code, 400) + self.assertEqual(data['message'], 'Agent does not exist') resp = self.successResultOf( request(self, self.root, b"POST", '{0}/entities/{1}/agents'.format(self.ctl_uri, self.entity_id), json.dumps({}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/views/agent_host_info?entityId={1}&include=system&include=cpus'.format( self.uri, self.entity_id))) - self.assertEquals(resp.code, 200) - self.assertEquals(self.entity_id, data['values'][0]['entity_id']) + self.assertEqual(resp.code, 200) + self.assertEqual(self.entity_id, data['values'][0]['entity_id']) def test_agenthostinfo_missing_entity_id_returns_400(self): """ @@ -1114,8 +1114,8 @@ def test_agenthostinfo_missing_entity_id_returns_400(self): (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/views/agent_host_info?include=system'.format(self.uri))) - self.assertEquals(resp.code, 400) - self.assertEquals(True, data['type'] == 'badRequest') + self.assertEqual(resp.code, 400) + self.assertEqual(True, data['type'] == 'badRequest') def test_agenthostinfo_nonexistent_entity_returns_404(self): """ @@ -1125,8 +1125,8 @@ def test_agenthostinfo_nonexistent_entity_returns_404(self): json_request(self, self.root, b"GET", '{0}/views/agent_host_info?entityId=enDoesNotExist&include=system'.format( self.uri))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['type'], 'notFoundError') + self.assertEqual(resp.code, 404) + self.assertEqual(data['type'], 'notFoundError') def test_agenthostinfo_missing_include_returns_400(self): """ @@ -1136,8 +1136,8 @@ def test_agenthostinfo_missing_include_returns_400(self): json_request(self, self.root, b"GET", '{0}/views/agent_host_info?entityId={1}'.format( self.uri, self.entity_id))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['message'], 'Validation error for key \'include\'') + self.assertEqual(resp.code, 400) + self.assertEqual(data['message'], 'Validation error for key \'include\'') def test_view_connections_missing_agentid_400s(self): """ @@ -1146,8 +1146,8 @@ def test_view_connections_missing_agentid_400s(self): (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/views/connections'.format(self.uri))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['message'], 'Validation error for key \'agentId\'') + self.assertEqual(resp.code, 400) + self.assertEqual(data['message'], 'Validation error for key \'agentId\'') def test_view_connections(self): """ @@ -1163,10 +1163,10 @@ def test_view_connections(self): json_request(self, self.root, b"GET", '{0}/views/connections?agentId={1}&agentId=agent-that-does-not-exist'.format( self.uri, agent_id))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) connections_by_agent_id = {conn['agent_id']: conn['connections'] for conn in data['values']} - self.assertEquals(len(connections_by_agent_id[agent_id]), 3) - self.assertEquals(len(connections_by_agent_id['agent-that-does-not-exist']), 0) + self.assertEqual(len(connections_by_agent_id[agent_id]), 3) + self.assertEqual(len(connections_by_agent_id['agent-that-does-not-exist']), 0) def test_agenthostinfo_bad_agent_id_returns_400(self): """ @@ -1176,13 +1176,13 @@ def test_agenthostinfo_bad_agent_id_returns_400(self): request(self, self.root, b"PUT", '{0}/entities/{1}'.format(self.uri, self.entity_id), json.dumps({'agent_id': 'LOLWUT'}).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/views/agent_host_info?entityId={1}&include=system'.format( self.uri, self.entity_id))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['details'], 'Agent LOLWUT does not exist') + self.assertEqual(resp.code, 400) + self.assertEqual(data['details'], 'Agent LOLWUT does not exist') def test_create_agent_missing_entity_returns_404(self): """ @@ -1192,8 +1192,8 @@ def test_create_agent_missing_entity_returns_404(self): json_request(self, self.root, b"POST", '{0}/entities/enDoesNotExist/agents'.format(self.ctl_uri, self.entity_id), json.dumps({}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['type'], 'notFoundError') + self.assertEqual(resp.code, 404) + self.assertEqual(data['type'], 'notFoundError') def test_agentinstallers(self): """ @@ -1201,7 +1201,7 @@ def test_agentinstallers(self): """ req = request(self, self.root, b"POST", self.uri + '/agent_installers') resp = self.successResultOf(req) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) xsil = one_text_header(resp, b'x-shell-installer-location') self.assertTrue('monitoring.api' in xsil) @@ -1211,10 +1211,10 @@ def test_metriclist(self): """ req = request(self, self.root, b"GET", self.uri + '/views/metric_list') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(self.entity_id, data['values'][0]['entity_id']) - self.assertEquals(self.check_id, data['values'][0]['checks'][0]['id']) + self.assertEqual(self.entity_id, data['values'][0]['entity_id']) + self.assertEqual(self.check_id, data['values'][0]['checks'][0]['id']) def test_unknown_check_type_returns_empty_metrics_list(self): """ @@ -1225,13 +1225,13 @@ def test_unknown_check_type_returns_empty_metrics_list(self): request(self, self.root, b"POST", '{0}/entities/{1}/checks'.format(self.uri, self.entity_id), json.dumps({'type': 'agent.chupacabra'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/views/metric_list'.format(self.uri))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) chupacabra_check = [check for check in data['values'][0]['checks'] if check['type'] == 'agent.chupacabra'] - self.assertEquals(chupacabra_check[0]['metrics'], []) + self.assertEqual(chupacabra_check[0]['metrics'], []) def test_metrics_list_agent_check(self): """ @@ -1242,13 +1242,13 @@ def test_metrics_list_agent_check(self): request(self, self.root, b"POST", '{0}/entities/{1}/checks'.format(self.uri, self.entity_id), json.dumps({'type': 'agent.cpu'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/views/metric_list'.format(self.uri))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) cpu_check = [check for check in data['values'][0]['checks'] if check['type'] == 'agent.cpu'] - self.assertEquals(cpu_check[0]['metrics'][0]['name'], 'user_percent_average') + self.assertEqual(cpu_check[0]['metrics'][0]['name'], 'user_percent_average') def test_multiplot(self): """ @@ -1257,7 +1257,7 @@ def test_multiplot(self): metrics = [] req = request(self, self.root, b"GET", self.uri + '/views/metric_list') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) for m in data['values'][0]['checks'][0]['metrics']: mq = {'entity_id': self.entity_id, 'check_id': self.check_id, 'metric': m['name']} @@ -1269,9 +1269,9 @@ def test_multiplot(self): json.dumps({'metrics': metrics}).encode("utf-8") ) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(500, len(data['metrics'][0]['data'])) + self.assertEqual(500, len(data['metrics'][0]['data'])) def test_multiplot_agent_check(self): """ @@ -1284,7 +1284,7 @@ def test_multiplot_agent_check(self): ) req = request(self, self.root, b"GET", self.uri + '/views/metric_list') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) for m in data['values'][0]['checks'][1]['metrics']: mq = {'entity_id': self.entity_id, @@ -1298,9 +1298,9 @@ def test_multiplot_agent_check(self): json.dumps({'metrics': metrics}).encode("utf-8") ) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(500, len(data['metrics'][0]['data'])) + self.assertEqual(500, len(data['metrics'][0]['data'])) def test_multiplot_missing_check_returns_400(self): """ @@ -1314,8 +1314,8 @@ def test_multiplot_missing_check_returns_400(self): json.dumps({'metrics': [{'entity_id': self.entity_id, 'check_id': 'bogus', 'metric': 'mzord.available'}]}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['type'], 'requiredNotFoundError') + self.assertEqual(resp.code, 400) + self.assertEqual(data['type'], 'requiredNotFoundError') def test_multiplot_unknown_check_type(self): """ @@ -1326,7 +1326,7 @@ def test_multiplot_unknown_check_type(self): request(self, self.root, b"POST", '{0}/entities/{1}/checks'.format(self.uri, self.entity_id), json.dumps({'type': 'agent.whatever'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) check_id, location = id_and_location(resp) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", @@ -1335,9 +1335,9 @@ def test_multiplot_unknown_check_type(self): json.dumps({'metrics': [{'entity_id': self.entity_id, 'check_id': check_id, 'metric': 'whut'}]}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['metrics'][0]['type'], 'unknown') - self.assertEquals(len(data['metrics'][0]['data']), 0) + self.assertEqual(resp.code, 200) + self.assertEqual(data['metrics'][0]['type'], 'unknown') + self.assertEqual(len(data['metrics'][0]['data']), 0) def test_multiplot_malformatted_remote_metric(self): """ @@ -1353,9 +1353,9 @@ def test_multiplot_malformatted_remote_metric(self): json.dumps({'metrics': [{'entity_id': self.entity_id, 'check_id': self.check_id, 'metric': 'LOLWUT'}]}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['metrics'][0]['type'], 'unknown') - self.assertEquals(len(data['metrics'][0]['data']), 0) + self.assertEqual(resp.code, 200) + self.assertEqual(data['metrics'][0]['type'], 'unknown') + self.assertEqual(len(data['metrics'][0]['data']), 0) def test_multiplot_nonexistent_metric(self): """ @@ -1370,9 +1370,9 @@ def test_multiplot_nonexistent_metric(self): json.dumps({'metrics': [{'entity_id': self.entity_id, 'check_id': self.check_id, 'metric': 'mzord.nonexistent'}]}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['metrics'][0]['type'], 'unknown') - self.assertEquals(len(data['metrics'][0]['data']), 0) + self.assertEqual(resp.code, 200) + self.assertEqual(data['metrics'][0]['type'], 'unknown') + self.assertEqual(len(data['metrics'][0]['data']), 0) def test_multiplot_single_point(self): """ @@ -1385,7 +1385,7 @@ def test_multiplot_single_point(self): json.dumps({'metrics': [{'entity_id': self.entity_id, 'check_id': self.check_id, 'metric': 'mzord.available'}]}).encode("utf-8"))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) def test_get_all_notification_plans(self): """ @@ -1393,9 +1393,9 @@ def test_get_all_notification_plans(self): """ req = request(self, self.root, b"GET", self.uri + '/notification_plans') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(2, data['metadata']['count']) + self.assertEqual(2, data['metadata']['count']) def test_get_notification_plan(self): """ @@ -1403,15 +1403,15 @@ def test_get_notification_plan(self): """ req = request(self, self.root, b"GET", self.uri + '/notification_plans/' + self.np_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['id'], self.np_id) + self.assertEqual(data['id'], self.np_id) req = request(self, self.root, b"GET", self.uri + '/notification_plans/npTechnicalContactsEmail') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['id'], 'npTechnicalContactsEmail') + self.assertEqual(data['id'], 'npTechnicalContactsEmail') def test_get_all_notifications(self): """ @@ -1419,9 +1419,9 @@ def test_get_all_notifications(self): """ req = request(self, self.root, b"GET", self.uri + '/notifications') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(2, data['metadata']['count']) + self.assertEqual(2, data['metadata']['count']) def test_update_notification(self): """ @@ -1431,10 +1431,10 @@ def test_update_notification(self): req = request(self, self.root, b"PUT", self.uri + '/notifications/' + self.nt_id, json.dumps(postdata).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/notifications') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) mynt = None for nt in data['values']: @@ -1442,7 +1442,7 @@ def test_update_notification(self): mynt = nt break self.assertIsNot(None, mynt) - self.assertEquals('changed', mynt['label']) + self.assertEqual('changed', mynt['label']) def test_update_missing_notification(self): """ @@ -1452,8 +1452,8 @@ def test_update_missing_notification(self): json_request(self, self.root, b"PUT", '{0}/notifications/ntDoesNotExist'.format(self.uri), json.dumps({'label': 'my awesome notification'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['message'], 'Object does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['message'], 'Object does not exist') def test_delete_notification(self): """ @@ -1461,17 +1461,17 @@ def test_delete_notification(self): """ req = request(self, self.root, b"DELETE", self.uri + '/notifications/' + self.nt_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/notifications') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) mynt = None for nt in data['values']: if nt['id'] == self.nt_id: mynt = nt break - self.assertEquals(None, mynt) + self.assertEqual(None, mynt) def test_delete_nonexistent_notification_404s(self): """ @@ -1479,8 +1479,8 @@ def test_delete_nonexistent_notification_404s(self): """ (resp, data) = self.successResultOf( json_request(self, self.root, b"DELETE", '{0}/notifications/ntWhut'.format(self.uri))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['details'], 'Object "Notification" with key "ntWhut" does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['details'], 'Object "Notification" with key "ntWhut" does not exist') def test_update_notificationplan(self): """ @@ -1490,12 +1490,12 @@ def test_update_notificationplan(self): req = request(self, self.root, b"PUT", self.uri + '/notification_plans/' + self.np_id, json.dumps(postdata).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/notification_plans/' + self.np_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals('changed', data['label']) + self.assertEqual('changed', data['label']) def test_update_missing_notification_plan(self): """ @@ -1505,8 +1505,8 @@ def test_update_missing_notification_plan(self): json_request(self, self.root, b"PUT", '{0}/notification_plans/npDoesNotExist'.format(self.uri), json.dumps({'label': 'WAT WAT WAT'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['message'], 'Object does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['message'], 'Object does not exist') def test_delete_notificationplan(self): """ @@ -1514,17 +1514,17 @@ def test_delete_notificationplan(self): """ req = request(self, self.root, b"DELETE", self.uri + '/notification_plans/' + self.np_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/notification_plans') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) mynp = None for np in data['values']: if np['id'] == self.np_id: mynp = np break - self.assertEquals(None, mynp) + self.assertEqual(None, mynp) def test_delete_nonexistent_notification_plan_404s(self): """ @@ -1532,8 +1532,8 @@ def test_delete_nonexistent_notification_plan_404s(self): """ (resp, data) = self.successResultOf( json_request(self, self.root, b"DELETE", '{0}/notification_plans/npWhut'.format(self.uri))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['details'], 'Object "NotificationPlan" with key "npWhut" does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['details'], 'Object "NotificationPlan" with key "npWhut" does not exist') def test_get_notificationtypes(self): """ @@ -1541,9 +1541,9 @@ def test_get_notificationtypes(self): """ req = request(self, self.root, b"GET", self.uri + '/notification_types') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(4, data['metadata']['count']) + self.assertEqual(4, data['metadata']['count']) def test_get_suppression(self): """ @@ -1551,13 +1551,13 @@ def test_get_suppression(self): """ req = request(self, self.root, b"GET", self.uri + '/suppressions/' + self.sp_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['id'], self.sp_id) - self.assertEquals(data['notification_plans'], []) - self.assertEquals(data['entities'], []) - self.assertEquals(data['checks'], []) - self.assertEquals(data['alarms'], []) + self.assertEqual(data['id'], self.sp_id) + self.assertEqual(data['notification_plans'], []) + self.assertEqual(data['entities'], []) + self.assertEqual(data['checks'], []) + self.assertEqual(data['alarms'], []) def test_get_all_suppressions(self): """ @@ -1565,10 +1565,10 @@ def test_get_all_suppressions(self): """ req = request(self, self.root, b"GET", self.uri + '/suppressions') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(1, data['metadata']['count']) - self.assertEquals(self.sp_id, data['values'][0]['id']) + self.assertEqual(1, data['metadata']['count']) + self.assertEqual(self.sp_id, data['values'][0]['id']) def test_update_suppression(self): """ @@ -1578,12 +1578,12 @@ def test_update_suppression(self): req = request(self, self.root, b"PUT", self.uri + '/suppressions/' + self.sp_id, json.dumps(postdata).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/suppressions/' + self.sp_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals('changed', data['label']) + self.assertEqual('changed', data['label']) def test_update_missing_suppression(self): """ @@ -1593,8 +1593,8 @@ def test_update_missing_suppression(self): json_request(self, self.root, b"PUT", '{0}/suppressions/spDoesNotExist'.format(self.uri), json.dumps({'label': 'my-suppression'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['message'], 'Object does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['message'], 'Object does not exist') def test_delete_suppression(self): """ @@ -1602,17 +1602,17 @@ def test_delete_suppression(self): """ req = request(self, self.root, b"DELETE", self.uri + '/suppressions/' + self.sp_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/suppressions') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) mysp = None for sp in data['values']: if sp['id'] == self.sp_id: mysp = sp break - self.assertEquals(None, mysp) + self.assertEqual(None, mysp) def test_delete_nonexistent_suppression_404s(self): """ @@ -1620,8 +1620,8 @@ def test_delete_nonexistent_suppression_404s(self): """ (resp, data) = self.successResultOf( json_request(self, self.root, b"DELETE", '{0}/suppressions/spWhut'.format(self.uri))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['details'], 'Object "Suppression" with key "spWhut" does not exist') + self.assertEqual(resp.code, 404) + self.assertEqual(data['details'], 'Object "Suppression" with key "spWhut" does not exist') def test_list_monitoring_zones(self): """ @@ -1629,10 +1629,10 @@ def test_list_monitoring_zones(self): """ req = request(self, self.root, b"GET", self.uri + '/monitoring_zones') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) mz = data['values'][0] - self.assertEquals('mzdfw', mz['id']) + self.assertEqual('mzdfw', mz['id']) def test_list_alarm_examples(self): """ @@ -1640,10 +1640,10 @@ def test_list_alarm_examples(self): """ req = request(self, self.root, b"GET", self.uri + '/alarm_examples') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) ax = data['values'][0] - self.assertEquals('remote.http_body_match_1', ax['id']) + self.assertEqual('remote.http_body_match_1', ax['id']) def test_alarm_count_per_np(self): """ @@ -1651,10 +1651,10 @@ def test_alarm_count_per_np(self): """ req = request(self, self.root, b"GET", self.uri + '/views/alarmCountsPerNp') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['values'][0]['alarm_count'], 1) - self.assertEquals(data['values'][0]['notification_plan_id'], 'npTechnicalContactsEmail') + self.assertEqual(data['values'][0]['alarm_count'], 1) + self.assertEqual(data['values'][0]['notification_plan_id'], 'npTechnicalContactsEmail') def test_alarms_by_np(self): """ @@ -1662,19 +1662,19 @@ def test_alarms_by_np(self): """ req = request(self, self.root, b"GET", self.uri + '/views/overview') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) alarm = self.get_responsebody(resp)['values'][0]['alarms'][0] alarm['notification_plan_id'] = self.np_id req = request(self, self.root, b"PUT", self.uri + '/entities/' + self.entity_id + '/alarms/' + self.alarm_id, json.dumps(alarm).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"GET", self.uri + '/views/alarmsByNp/' + self.np_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['values'][0]['id'], self.alarm_id) + self.assertEqual(data['values'][0]['id'], self.alarm_id) def test_delete_np_in_use(self): """ @@ -1682,17 +1682,17 @@ def test_delete_np_in_use(self): """ req = request(self, self.root, b"GET", self.uri + '/views/overview') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) alarm = self.get_responsebody(resp)['values'][0]['alarms'][0] alarm['notification_plan_id'] = self.np_id req = request(self, self.root, b"PUT", self.uri + '/entities/' + self.entity_id + '/alarms/' + self.alarm_id, json.dumps(alarm).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) req = request(self, self.root, b"DELETE", self.uri + '/notification_plans/' + self.np_id) resp = self.successResultOf(req) - self.assertEquals(resp.code, 403) + self.assertEqual(resp.code, 403) data = self.get_responsebody(resp) self.assertTrue(self.alarm_id in data['message']) self.assertTrue(self.alarm_id in data['details']) @@ -1703,28 +1703,28 @@ def test_reset_session(self): """ req = request(self, self.root, b"GET", self.uri + '/entities') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['metadata']['count'], 1) + self.assertEqual(data['metadata']['count'], 1) req = request(self, self.root, b"GET", self.uri + '/mimic/reset') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) req = request(self, self.root, b"GET", self.uri + '/entities') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['metadata']['count'], 0) + self.assertEqual(data['metadata']['count'], 0) def test_unicode_label(self): """ Create an entity with weird letters in the name. """ req = request(self, self.root, b"POST", self.uri + '/entities', - json.dumps({'label': u'\u0CA0_\u0CA0'}).encode("utf-8")) + json.dumps({'label': '\u0CA0_\u0CA0'}).encode("utf-8")) resp = self.successResultOf(req) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) def test_overview_pagination(self): """ @@ -1733,16 +1733,16 @@ def test_overview_pagination(self): self.createEntity('entity-2') req = request(self, self.root, b"GET", self.uri + '/views/overview?limit=1') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['values'][0]['entity']['label'], 'ItsAnEntity') + self.assertEqual(data['values'][0]['entity']['label'], 'ItsAnEntity') req = request(self, self.root, b"GET", self.uri + '/views/overview?marker=' + data['metadata']['next_marker']) resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['values'][0]['entity']['label'], 'entity-2') + self.assertEqual(data['values'][0]['entity']['label'], 'entity-2') def test_overview_pagination_marker_not_found(self): """ @@ -1751,9 +1751,9 @@ def test_overview_pagination_marker_not_found(self): """ req = request(self, self.root, b"GET", self.uri + '/views/overview?marker=enDoesNotExist') resp = self.successResultOf(req) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) data = self.get_responsebody(resp) - self.assertEquals(data['values'][0]['entity']['label'], 'ItsAnEntity') + self.assertEqual(data['values'][0]['entity']['label'], 'ItsAnEntity') def test_overview_filters_by_entity(self): """ @@ -1764,9 +1764,9 @@ def test_overview_filters_by_entity(self): json_request(self, self.root, b"GET", '{0}/views/overview?entityId={1}'.format( self.uri, self.entity_id))) - self.assertEquals(resp.code, 200) - self.assertEquals(len(data['values']), 1) - self.assertEquals(data['values'][0]['entity']['label'], 'ItsAnEntity') + self.assertEqual(resp.code, 200) + self.assertEqual(len(data['values']), 1) + self.assertEqual(data['values'][0]['entity']['label'], 'ItsAnEntity') def test_overview_missing_entity_404s(self): """ @@ -1776,8 +1776,8 @@ def test_overview_missing_entity_404s(self): json_request(self, self.root, b"GET", '{0}/views/overview?entityId={1}'.format( self.uri, 'enDoesNotExist'))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['type'], 'notFoundError') + self.assertEqual(resp.code, 404) + self.assertEqual(data['type'], 'notFoundError') def test_latest_alarm_states(self): """ @@ -1791,11 +1791,11 @@ def test_latest_alarm_states(self): json.dumps({'state': 'CRITICAL', 'analyzed_by_monitoring_zone_id': 'mzVegetaScouter', 'status': 'It\'s OVER... NINE... THOUSAND!!1'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/views/latest_alarm_states'.format(self.uri))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['values'][0]['latest_alarm_states'][0]['state'], 'CRITICAL') + self.assertEqual(resp.code, 200) + self.assertEqual(data['values'][0]['latest_alarm_states'][0]['state'], 'CRITICAL') def test_change_log(self): """ @@ -1808,7 +1808,7 @@ def test_change_log(self): json.dumps({'state': 'OK', 'analyzed_by_monitoring_zone_id': 'mzVegetaScouter', 'status': 'It\'s OVER... NINE... THOUSAND!!1'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) resp = self.successResultOf( request(self, self.root, b"POST", @@ -1817,19 +1817,19 @@ def test_change_log(self): json.dumps({'state': 'CRITICAL', 'analyzed_by_monitoring_zone_id': 'mzVegetaScouter', 'status': 'i guess its eight thousand or so nbd'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/changelogs/alarms'.format(self.uri))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) all_alarms = data['values'] - self.assertEquals(len(all_alarms), 2) + self.assertEqual(len(all_alarms), 2) should_be_ok = all_alarms[0] should_be_critical = all_alarms[1] - self.assertEquals(should_be_ok['state'], 'OK') - self.assertEquals(should_be_critical['state'], 'CRITICAL') - self.assertEquals(should_be_critical['entity_id'], self.entity_id) - self.assertEquals(should_be_critical['check_id'], self.check_id) - self.assertEquals(should_be_critical['alarm_id'], self.alarm_id) + self.assertEqual(should_be_ok['state'], 'OK') + self.assertEqual(should_be_critical['state'], 'CRITICAL') + self.assertEqual(should_be_critical['entity_id'], self.entity_id) + self.assertEqual(should_be_critical['check_id'], self.check_id) + self.assertEqual(should_be_critical['alarm_id'], self.alarm_id) def test_alarm_states_same_alarm_gets_previous_state(self): """ @@ -1843,18 +1843,18 @@ def test_alarm_states_same_alarm_gets_previous_state(self): json.dumps({'state': 'CRITICAL', 'analyzed_by_monitoring_zone_id': 'mzVegetaScouter', 'status': 'It\'s OVER... NINE... THOUSAND!!1'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) resp = self.successResultOf( request(self, self.root, b"POST", '{0}/entities/{1}/alarms/{2}/states'.format( self.ctl_uri, self.entity_id, self.alarm_id), json.dumps({'state': 'OK', 'status': 'Meh'}).encode("utf-8"))) - self.assertEquals(resp.code, 201) + self.assertEqual(resp.code, 201) (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/views/latest_alarm_states'.format(self.uri))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['values'][0]['latest_alarm_states'][0]['previous_state'], 'CRITICAL') + self.assertEqual(resp.code, 200) + self.assertEqual(data['values'][0]['latest_alarm_states'][0]['previous_state'], 'CRITICAL') def test_create_alarm_state_missing_alarm_404s(self): """ @@ -1866,8 +1866,8 @@ def test_create_alarm_state_missing_alarm_404s(self): '{0}/entities/{1}/alarms/{2}/states'.format( self.ctl_uri, self.entity_id, 'alDoesNotExist'), json.dumps({'state': 'OK', 'status': 'bogus'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['type'], 'notFoundError') + self.assertEqual(resp.code, 404) + self.assertEqual(data['type'], 'notFoundError') def test_create_alarm_state_missing_state_400s(self): """ @@ -1879,9 +1879,9 @@ def test_create_alarm_state_missing_state_400s(self): '{0}/entities/{1}/alarms/{2}/states'.format( self.ctl_uri, self.entity_id, self.alarm_id), json.dumps({'status': 'This wont work'}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['type'], 'badRequest') - self.assertEquals(data['details'], 'Missing required key (state)') + self.assertEqual(resp.code, 400) + self.assertEqual(data['type'], 'badRequest') + self.assertEqual(data['details'], 'Missing required key (state)') def test_create_alarm_state_missing_status_400s(self): """ @@ -1893,9 +1893,9 @@ def test_create_alarm_state_missing_status_400s(self): '{0}/entities/{1}/alarms/{2}/states'.format( self.ctl_uri, self.entity_id, self.alarm_id), json.dumps({'state': 'WARNING'}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['type'], 'badRequest') - self.assertEquals(data['details'], 'Missing required key (status)') + self.assertEqual(resp.code, 400) + self.assertEqual(data['type'], 'badRequest') + self.assertEqual(data['details'], 'Missing required key (status)') def test_set_overrides_missing_check(self): """ @@ -1906,9 +1906,9 @@ def test_set_overrides_missing_check(self): '{0}/entities/{1}/checks/chWhut/metrics/available'.format( self.ctl_uri, self.entity_id), json.dumps({'type': 'squarewave'}).encode("utf-8"))) - self.assertEquals(resp.code, 404) - self.assertEquals(data['type'], 'notFoundError') - self.assertEquals(data['details'], ('Object "Check" with key ' + + self.assertEqual(resp.code, 404) + self.assertEqual(data['type'], 'notFoundError') + self.assertEqual(data['details'], ('Object "Check" with key ' + '"{0}:chWhut" does not exist'.format(self.entity_id))) def test_set_overrides_unknown_type(self): @@ -1921,9 +1921,9 @@ def test_set_overrides_unknown_type(self): '{0}/entities/{1}/checks/{2}/metrics/available'.format( self.ctl_uri, self.entity_id, self.check_id), json.dumps({'type': 'lolwut'}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['type'], 'badRequest') - self.assertEquals(data['details'], 'Unknown value for "type": "lolwut"') + self.assertEqual(resp.code, 400) + self.assertEqual(data['type'], 'badRequest') + self.assertEqual(data['details'], 'Unknown value for "type": "lolwut"') def test_set_overrides_squarewave(self): """ @@ -1939,13 +1939,13 @@ def test_set_overrides_squarewave(self): 'offset': 0, 'period': 100}, 'monitoring_zones': ['mzord']}).encode("utf-8"))) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) (resp, data) = self.successResultOf( json_request(self, self.root, b"POST", '{0}/__experiments/multiplot?from=1&to=99&points=2'.format(self.uri), json.dumps({'metrics': [{'entity_id': self.entity_id, 'check_id': self.check_id, 'metric': 'mzord.available'}]}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['metrics'][0]['data'][0]['average'], 11) - self.assertEquals(data['metrics'][0]['data'][1]['average'], 22) + self.assertEqual(resp.code, 200) + self.assertEqual(data['metrics'][0]['data'][0]['average'], 11) + self.assertEqual(data['metrics'][0]['data'][1]['average'], 22) diff --git a/mimic/test/test_mailgun.py b/mimic/test/test_mailgun.py index 7bdbc90a3d..df1fcd9bfe 100644 --- a/mimic/test/test_mailgun.py +++ b/mimic/test/test_mailgun.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + from six.moves.urllib.parse import urlencode diff --git a/mimic/test/test_neutron.py b/mimic/test/test_neutron.py index 5ee6e00c0a..5d871202f4 100644 --- a/mimic/test/test_neutron.py +++ b/mimic/test/test_neutron.py @@ -2,7 +2,7 @@ Tests for neutron api """ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase from mimic.test.helpers import json_request from mimic.rest.neutron_api import NeutronApi diff --git a/mimic/test/test_noit.py b/mimic/test/test_noit.py index 862acb5fc9..4ad2f4e82c 100644 --- a/mimic/test/test_noit.py +++ b/mimic/test/test_noit.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import uuid import xmltodict diff --git a/mimic/test/test_nova.py b/mimic/test/test_nova.py index 2fedadad71..1f51cec76c 100644 --- a/mimic/test/test_nova.py +++ b/mimic/test/test_nova.py @@ -1,7 +1,7 @@ """ Tests for :mod:`nova_api` and :mod:`nova_objects`. """ -from __future__ import absolute_import, division, unicode_literals + import json @@ -263,7 +263,7 @@ def validate_server_detail_json(self, server_json): validate_link_json(self, server_json['flavor']) self.assertIsInstance(server_json['addresses'], dict) - for addresses in server_json['addresses'].values(): + for addresses in list(server_json['addresses'].values()): self.assertIsInstance(addresses, list) for address in addresses: self.assertIn('addr', address) @@ -1121,7 +1121,7 @@ def test_returns_deleted_servers(self): delete_server(self.helper, self.server1) self.clock.advance(2) matcher = MatchesListwise( - [ContainsDict({"status": Equals(u"DELETED"), "id": Equals(self.server1)})]) + [ContainsDict({"status": Equals("DELETED"), "id": Equals(self.server1)})]) mismatch = matcher.match(self.list_servers_detail(1.5)) self.assertIs(mismatch, None) @@ -1130,7 +1130,7 @@ def test_returns_updated_status_servers(self): Returns servers whose status has been updated since given time """ self.clock.advance(1) - update_status(self.helper, self.control_endpoint, self.server2, u"ERROR") + update_status(self.helper, self.control_endpoint, self.server2, "ERROR") self.assertEqual(self.list_servers(1.5), [self.server2]) def test_returns_updated_metadata_servers(self): @@ -1641,7 +1641,7 @@ def test_create_server_request_with_no_body_causes_bad_request(self): """ create_server_response, _ = create_server( self.helper, body_override=b"") - self.assertEquals(create_server_response.code, 400) + self.assertEqual(create_server_response.code, 400) def test_create_server_request_with_invalid_body_causes_bad_request(self): """ @@ -1650,7 +1650,7 @@ def test_create_server_request_with_invalid_body_causes_bad_request(self): """ create_server_response, _ = create_server( self.helper, body_override=b'{ bad request: }') - self.assertEquals(create_server_response.code, 400) + self.assertEqual(create_server_response.code, 400) def test_create_server_failure(self): """ @@ -1662,11 +1662,11 @@ def test_create_server_failure(self): metadata = {"create_server_failure": json.dumps(serverfail)} create_server_response, create_server_response_body = create_server( self.helper, metadata=metadata) - self.assertEquals(create_server_response.code, 500) - self.assertEquals( + self.assertEqual(create_server_response.code, 500) + self.assertEqual( create_server_response_body['specialType']['message'], "Create server failure") - self.assertEquals( + self.assertEqual( create_server_response_body['specialType']['code'], 500) def test_create_server_failure_string_type(self): @@ -1679,8 +1679,8 @@ def test_create_server_failure_string_type(self): metadata = {"create_server_failure": json.dumps(serverfail)} create_server_response, create_server_response_body = create_server( self.helper, metadata=metadata, request_func=request_with_content) - self.assertEquals(create_server_response.code, 500) - self.assertEquals(create_server_response_body.decode("utf-8"), + self.assertEqual(create_server_response.code, 500) + self.assertEqual(create_server_response_body.decode("utf-8"), "Create server failure") def test_create_server_failure_and_list_servers(self): @@ -1692,19 +1692,19 @@ def test_create_server_failure_and_list_servers(self): metadata = {"create_server_failure": json.dumps(serverfail)} create_server_response, create_server_response_body = create_server( self.helper, metadata=metadata) - self.assertEquals(create_server_response.code, 500) - self.assertEquals( + self.assertEqual(create_server_response.code, 500) + self.assertEqual( create_server_response_body['computeFault']['message'], "Create server failure") - self.assertEquals( + self.assertEqual( create_server_response_body['computeFault']['code'], 500) # List servers list_servers = request(self, self.root, b"GET", self.uri + '/servers') list_servers_response = self.successResultOf(list_servers) - self.assertEquals(list_servers_response.code, 200) + self.assertEqual(list_servers_response.code, 200) list_servers_response_body = self.successResultOf( treq.json_content(list_servers_response)) - self.assertEquals(list_servers_response_body['servers'], []) + self.assertEqual(list_servers_response_body['servers'], []) def test_server_in_building_state_for_specified_time(self): """ @@ -1712,9 +1712,9 @@ def test_server_in_building_state_for_specified_time(self): status for the time specified in the metadata. """ self.do_timing_test(metadata={"server_building": "1"}, - before=u"BUILD", + before="BUILD", delay=2.0, - after=u"ACTIVE") + after="ACTIVE") def test_server_building_behavior(self): """ @@ -1724,9 +1724,9 @@ def test_server_building_behavior(self): """ use_creation_behavior(self.helper, "build", {"duration": 4.0}, []) self.do_timing_test(metadata={}, - before=u"BUILD", + before="BUILD", delay=5.0, - after=u"ACTIVE") + after="ACTIVE") def test_server_active_then_error_behavior(self): """ @@ -1737,9 +1737,9 @@ def test_server_active_then_error_behavior(self): use_creation_behavior( self.helper, "active-then-error", {"duration": 7.0}, []) self.do_timing_test(metadata={}, - before=u"ACTIVE", + before="ACTIVE", delay=8.0, - after=u"ERROR") + after="ERROR") def do_timing_test(self, metadata, before, delay, after): """ @@ -1754,22 +1754,22 @@ def get_server_status(): return status_of_server(self, server_id) # get server and verify status is BUILD - self.assertEquals(get_server_status(), before) + self.assertEqual(get_server_status(), before) # List servers with details and verify the server is in BUILD status list_servers = request( self, self.root, b"GET", self.uri + '/servers/detail') list_servers_response = self.successResultOf(list_servers) - self.assertEquals(list_servers_response.code, 200) + self.assertEqual(list_servers_response.code, 200) list_servers_response_body = self.successResultOf( treq.json_content(list_servers_response)) - self.assertEquals(len(list_servers_response_body['servers']), 1) + self.assertEqual(len(list_servers_response_body['servers']), 1) building_server = list_servers_response_body['servers'][0] - self.assertEquals(building_server['status'], before) + self.assertEqual(building_server['status'], before) # Time Passes... self.helper.clock.advance(delay) # get server and verify status changed to active - self.assertEquals(get_server_status(), after) + self.assertEqual(get_server_status(), after) def test_server_in_error_state(self): """ @@ -1784,7 +1784,7 @@ def test_server_in_error_state(self): get_server_response = self.successResultOf(get_server) get_server_response_body = self.successResultOf( treq.json_content(get_server_response)) - self.assertEquals( + self.assertEqual( get_server_response_body['server']['status'], "ERROR") def test_delete_server_fails_specified_number_of_times(self): @@ -1806,7 +1806,7 @@ def test_delete_server_fails_specified_number_of_times(self): get_server = request(self, self.root, b"GET", self.uri + '/servers/' + server_id) get_server_response = self.successResultOf(get_server) - self.assertEquals(get_server_response.code, 200) + self.assertEqual(get_server_response.code, 200) # delete server again and verify the response delete_server = request( self, self.root, b"DELETE", self.uri + '/servers/' + server_id) @@ -1818,7 +1818,7 @@ def test_delete_server_fails_specified_number_of_times(self): get_server = request( self, self.root, b"GET", self.uri + '/servers/' + server_id) get_server_response = self.successResultOf(get_server) - self.assertEquals(get_server_response.code, 404) + self.assertEqual(get_server_response.code, 404) def test_create_server_failure_using_behaviors(self): """ @@ -1833,11 +1833,11 @@ def test_create_server_failure_using_behaviors(self): ) create_server_response, create_server_response_body = create_server( self.helper, name="failing_server_name") - self.assertEquals(create_server_response.code, 500) - self.assertEquals( + self.assertEqual(create_server_response.code, 500) + self.assertEqual( create_server_response_body['computeFault']['message'], "Create server failure") - self.assertEquals( + self.assertEqual( create_server_response_body['computeFault']['code'], 500) def test_create_server_failure_based_on_metadata(self): @@ -1855,7 +1855,7 @@ def test_create_server_failure_based_on_metadata(self): ) create_server_response, _ = create_server( self.helper, name="failing_server_name") - self.assertEquals(create_server_response.code, 202) + self.assertEqual(create_server_response.code, 202) failing_create_response, failing_create_response_body = create_server( self.helper, @@ -1863,10 +1863,10 @@ def test_create_server_failure_based_on_metadata(self): "field2": "regular expression"} ) - self.assertEquals( + self.assertEqual( failing_create_response_body['specialType']['message'], "Sample failure message") - self.assertEquals( + self.assertEqual( failing_create_response_body['specialType']['code'], 503) def _try_false_negative_failure(self, failure_type=None): @@ -1896,7 +1896,7 @@ def _try_false_negative_failure(self, failure_type=None): name="failing_server_name", request_func=request_with_content ) - self.assertEquals(create_server_response.code, 500) + self.assertEqual(create_server_response.code, 500) # List servers with details and verify there are no servers resp, list_body = self.successResultOf(json_request( @@ -1914,9 +1914,9 @@ def test_create_false_negative_failure_using_behaviors(self): """ response, body = self._try_false_negative_failure() body = json.loads(body.decode("utf-8")) - self.assertEquals(body['computeFault']['message'], + self.assertEqual(body['computeFault']['message'], "Create server failure") - self.assertEquals(body['computeFault']['code'], 500) + self.assertEqual(body['computeFault']['code'], 500) def test_create_false_negative_failure_with_specific_type(self): """ @@ -1927,9 +1927,9 @@ def test_create_false_negative_failure_with_specific_type(self): """ response, body = self._try_false_negative_failure('specialType') body = json.loads(body.decode("utf-8")) - self.assertEquals(body['specialType']['message'], + self.assertEqual(body['specialType']['message'], "Create server failure") - self.assertEquals(body['specialType']['code'], 500) + self.assertEqual(body['specialType']['code'], 500) def test_create_false_negative_failure_with_string_type(self): """ @@ -1939,7 +1939,7 @@ def test_create_false_negative_failure_with_string_type(self): when the type is "string". """ response, body = self._try_false_negative_failure("string") - self.assertEquals(body, b"Create server failure") + self.assertEqual(body, b"Create server failure") def test_modify_status_non_existent_server(self): """ @@ -2011,15 +2011,15 @@ def validate_injected_behavior(self, name_and_params, response, body): Given the behavior that is expected, validate the response and body. """ name, params = name_and_params - self.api_helper.test_case.assertEquals(response.code, params['code']) - self.api_helper.test_case.assertEquals(body.decode("utf-8"), + self.api_helper.test_case.assertEqual(response.code, params['code']) + self.api_helper.test_case.assertEqual(body.decode("utf-8"), params['message']) def validate_default_behavior(self, response, body): """ Validate the response and body of a successful server create. """ - self.api_helper.test_case.assertEquals(response.code, 202) + self.api_helper.test_case.assertEqual(response.code, 202) body = json.loads(body.decode("utf-8")) self.api_helper.test_case.assertIn('server', body) diff --git a/mimic/test/test_nova_images.py b/mimic/test/test_nova_images.py index 24882b87bb..e68d7477af 100644 --- a/mimic/test/test_nova_images.py +++ b/mimic/test/test_nova_images.py @@ -2,7 +2,7 @@ Tests for :mod:`nova_api` and :mod:`nova_objects` for images. """ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase diff --git a/mimic/test/test_queue.py b/mimic/test/test_queue.py index aff873f0bd..0655e31162 100644 --- a/mimic/test/test_queue.py +++ b/mimic/test/test_queue.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import json import treq @@ -82,14 +82,14 @@ def test_post_and_list_messages(self): '{0}/queues/{1}/messages'.format(self.uri, self.queue_name), [{'ttl': 60, 'body': {'text': 'Wow'}}], headers={b'Client-ID': [b'client-1']})) - self.assertEquals(resp.code, 201) - self.assertEquals(len(data['resources']), 1) + self.assertEqual(resp.code, 201) + self.assertEqual(len(data['resources']), 1) (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/queues/{1}/messages'.format(self.uri, self.queue_name), headers={b'Client-ID': [b'client-2']})) - self.assertEquals(resp.code, 200) - self.assertEquals(data['messages'][0]['body']['text'], 'Wow') + self.assertEqual(resp.code, 200) + self.assertEqual(data['messages'][0]['body']['text'], 'Wow') def test_list_messages_nonexisting_queue(self): """ @@ -99,7 +99,7 @@ def test_list_messages_nonexisting_queue(self): request(self, self.root, b"GET", '{0}/queues/does-not-exist/messages'.format(self.uri, self.queue_name), headers={b'Client-ID': [b'client-2']})) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) def test_post_to_nonexisting_queue(self): """ @@ -110,7 +110,7 @@ def test_post_to_nonexisting_queue(self): '{0}/queues/does-not-exist/messages'.format(self.uri), [{'ttl': 60, 'body': {'text': 'Wow'}}], headers={b'Client-ID': [b'client-1']})) - self.assertEquals(resp.code, 404) + self.assertEqual(resp.code, 404) def test_same_client_message_is_invisible(self): """ @@ -121,13 +121,13 @@ def test_same_client_message_is_invisible(self): '{0}/queues/{1}/messages'.format(self.uri, self.queue_name), [{'ttl': 60, 'body': {'text': 'Wow'}}], headers={b'Client-ID': [b'client-1']})) - self.assertEquals(resp.code, 201) - self.assertEquals(len(data['resources']), 1) + self.assertEqual(resp.code, 201) + self.assertEqual(len(data['resources']), 1) resp = self.successResultOf( request(self, self.root, b"GET", '{0}/queues/{1}/messages'.format(self.uri, self.queue_name), headers={b'Client-ID': [b'client-1']})) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) def test_same_client_message_shows_with_echo(self): """ @@ -138,15 +138,15 @@ def test_same_client_message_shows_with_echo(self): '{0}/queues/{1}/messages'.format(self.uri, self.queue_name), [{'ttl': 60, 'body': {'text': 'Wow'}}], headers={b'Client-ID': [b'client-1']})) - self.assertEquals(resp.code, 201) - self.assertEquals(len(data['resources']), 1) + self.assertEqual(resp.code, 201) + self.assertEqual(len(data['resources']), 1) (resp, data) = self.successResultOf( json_request(self, self.root, b"GET", '{0}/queues/{1}/messages?echo=true'.format( self.uri, self.queue_name), headers={b'Client-ID': [b'client-1']})) - self.assertEquals(resp.code, 200) - self.assertEquals(data['messages'][0]['body']['text'], 'Wow') + self.assertEqual(resp.code, 200) + self.assertEqual(data['messages'][0]['body']['text'], 'Wow') def test_old_messages_expire(self): """ @@ -157,11 +157,11 @@ def test_old_messages_expire(self): '{0}/queues/{1}/messages'.format(self.uri, self.queue_name), [{'ttl': 60, 'body': {'text': 'Wow'}}], headers={b'Client-ID': [b'client-1']})) - self.assertEquals(resp.code, 201) - self.assertEquals(len(data['resources']), 1) + self.assertEqual(resp.code, 201) + self.assertEqual(len(data['resources']), 1) self.clock.advance(61) resp = self.successResultOf(request(self, self.root, b"GET", '{0}/queues/{1}/messages?echo=true'.format( self.uri, self.queue_name), headers={b'Client-ID': [b'client-2']})) - self.assertEquals(resp.code, 204) + self.assertEqual(resp.code, 204) diff --git a/mimic/test/test_rackconnect_v3.py b/mimic/test/test_rackconnect_v3.py index d2d461d613..5e825fd363 100644 --- a/mimic/test/test_rackconnect_v3.py +++ b/mimic/test/test_rackconnect_v3.py @@ -2,7 +2,7 @@ Unit tests for the Rackspace RackConnect V3 API. """ -from __future__ import absolute_import, division, unicode_literals + import attr import json @@ -156,12 +156,12 @@ def get_lb_ids(self): """ Helper function to get the load balancer ids per region """ - _, resp_jsons = zip(*[ + _, resp_jsons = list(zip(*[ self.successResultOf(json_request( self, self.helper.root, b"GET", self.helper.get_service_endpoint("rackconnect", region) + "/load_balancer_pools")) - for region in self.rcv3.regions]) + for region in self.rcv3.regions])) lb_ids = [[lb['id'] for lb in lbs] for lbs in resp_jsons] return lb_ids diff --git a/mimic/test/test_resource.py b/mimic/test/test_resource.py index 7f917d5b62..093539bf91 100644 --- a/mimic/test/test_resource.py +++ b/mimic/test/test_resource.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import json import re @@ -43,9 +43,9 @@ def one_api(testCase, core): # Since there is only 1 API it can be assumed to be either an internal # or external API. if len(core._uuid_to_api_external): - service_id, api = next(iter(core._uuid_to_api_external.items())) + service_id, api = next(iter(list(core._uuid_to_api_external.items()))) else: - service_id, api = next(iter(core._uuid_to_api_internal.items())) + service_id, api = next(iter(list(core._uuid_to_api_internal.items()))) region = api.catalog_entries(tenant_id=None)[0].endpoints[0].region return (region, service_id) diff --git a/mimic/test/test_session.py b/mimic/test/test_session.py index 69321c9fc7..44dca0ecdd 100644 --- a/mimic/test/test_session.py +++ b/mimic/test/test_session.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import six from datetime import datetime diff --git a/mimic/test/test_swift.py b/mimic/test/test_swift.py index 8290b50e3e..f4309e2c12 100644 --- a/mimic/test/test_swift.py +++ b/mimic/test/test_swift.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + from json import loads, dumps @@ -59,7 +59,7 @@ def setUp(self): self.swift_uri = self.swift_endpoint['publicURL'] # container information - self.container_name = u"/testcontainer" + self.container_name = "/testcontainer" self.uri = (self.swift_uri + self.container_name).encode('ascii') # object information @@ -265,7 +265,7 @@ def test_service_catalog(self): self.assertEqual(self.auth_response.code, 200) self.assertTrue(self.json_body) sample_entry = self.json_body['access']['serviceCatalog'][0] - self.assertEqual(sample_entry['type'], u'object-store') + self.assertEqual(sample_entry['type'], 'object-store') sample_endpoint = sample_entry['endpoints'][0] self.assertEqual( sample_endpoint['tenantId'], @@ -379,7 +379,7 @@ def test_post_account_metadata(self, post_metadata): if headers is not None: # Verify each header that was posted to the account was # returned in the HEAD request. - for k, v in headers.items(): + for k, v in list(headers.items()): self.assertEqual( head_response.headers.getRawHeaders(k), v) @@ -636,7 +636,7 @@ def test_get_object(self): object_response, object_content = self.get_object() # validate the response - self.assertEquals(object_content, self.object_data) + self.assertEqual(object_content, self.object_data) def test_get_object_path_based_name(self): """ @@ -665,7 +665,7 @@ def test_get_object_path_based_name(self): # Get the object object_response, object_body = self.get_object( object_path=object_uri) - self.assertEquals(object_body, self.object_data) + self.assertEqual(object_body, self.object_data) def test_get_object_non_existent_container_non_existent_object(self): """ @@ -774,7 +774,7 @@ def test_put_object(self): # Get the object object_response, object_body = self.get_object( object_path=self.object_uri) - self.assertEquals(object_body, self.object_data) + self.assertEqual(object_body, self.object_data) def test_put_object_path_based_name(self): """ @@ -822,7 +822,7 @@ def test_put_object_path_based_name(self): # Get the object object_response, object_body = self.get_object( object_path=object_uri) - self.assertEquals(object_body, self.object_data) + self.assertEqual(object_body, self.object_data) # clean up the object self.delete_object(object_path=object_uri) @@ -839,7 +839,7 @@ def test_put_object_updates_object(self): # Get the object object_response, object_body = self.get_object() - self.assertEquals(object_body, new_data) + self.assertEqual(object_body, new_data) def test_put_object_non_existent_container(self): """ @@ -942,7 +942,7 @@ def test_head_object_path_based_name(self): # HEAD the object object_response, object_body = self.head_object( object_path=object_uri, with_body=True) - self.assertEquals(object_body, b"") + self.assertEqual(object_body, b"") def test_head_object_non_existent_container_non_existent_object(self): """ diff --git a/mimic/test/test_tap.py b/mimic/test/test_tap.py index 6cc74e4d3f..754c9d5925 100644 --- a/mimic/test/test_tap.py +++ b/mimic/test/test_tap.py @@ -2,7 +2,7 @@ Tests for L{mimic.tap} """ -from __future__ import absolute_import, division, unicode_literals + import sys import types diff --git a/mimic/test/test_util.py b/mimic/test/test_util.py index ab4ab3a095..ed5f741c3d 100644 --- a/mimic/test/test_util.py +++ b/mimic/test/test_util.py @@ -2,7 +2,7 @@ Unit tests for :mod:`mimic.util` """ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase from twisted.web.resource import Resource @@ -97,7 +97,7 @@ def test_unicode_body(self): is wrong. """ self.failureResultOf( - request(self, Resource(), b"POST", b"", u"not bytes") + request(self, Resource(), b"POST", b"", "not bytes") ) diff --git a/mimic/test/test_valkyrie.py b/mimic/test/test_valkyrie.py index 1d8eb7fd4a..a1eaa87759 100644 --- a/mimic/test/test_valkyrie.py +++ b/mimic/test/test_valkyrie.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + from twisted.trial.unittest import SynchronousTestCase from twisted.internet.task import Clock diff --git a/mimic/test/test_yo.py b/mimic/test/test_yo.py index 8327588633..e8affc2056 100644 --- a/mimic/test/test_yo.py +++ b/mimic/test/test_yo.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import json @@ -30,8 +30,8 @@ def test_send_yo(self): self, self.root, b"POST", '{0}/yo/'.format(self.uri), json.dumps({'username': 'TESTUSER1', 'api_key': 'A1234567890'}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['success'], True) + self.assertEqual(resp.code, 200) + self.assertEqual(data['success'], True) def test_send_yo_to_same_username_gets_same_userid(self): """ @@ -42,13 +42,13 @@ def test_send_yo_to_same_username_gets_same_userid(self): self, self.root, b"POST", '{0}/yo/'.format(self.uri), json.dumps({'username': 'TESTUSER2', 'api_key': 'A1234567890'}).encode("utf-8"))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) (resp, data2) = self.successResultOf(json_request( self, self.root, b"POST", '{0}/yo/'.format(self.uri), json.dumps({'username': 'TESTUSER2', 'api_key': 'A1234567890'}).encode("utf-8"))) - self.assertEquals(resp.code, 200) - self.assertEquals(data1['recipient']['user_id'], data2['recipient']['user_id']) + self.assertEqual(resp.code, 200) + self.assertEqual(data1['recipient']['user_id'], data2['recipient']['user_id']) def test_send_yo_missing_api_key_errors(self): """ @@ -57,8 +57,8 @@ def test_send_yo_missing_api_key_errors(self): (resp, data) = self.successResultOf(json_request( self, self.root, b"POST", '{0}/yo/'.format(self.uri), json.dumps({'username': 'TESTUSER1'}).encode("utf-8"))) - self.assertEquals(resp.code, 401) - self.assertEquals(data['error'], 'User does not have permissions for this request') + self.assertEqual(resp.code, 401) + self.assertEqual(data['error'], 'User does not have permissions for this request') def test_send_yo_missing_username_errors(self): """ @@ -67,8 +67,8 @@ def test_send_yo_missing_username_errors(self): (resp, data) = self.successResultOf(json_request( self, self.root, b"POST", '{0}/yo/'.format(self.uri), json.dumps({'api_key': 'A1234567890'}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['error'], 'Can\'t send Yo without a recipient.') + self.assertEqual(resp.code, 400) + self.assertEqual(data['error'], 'Can\'t send Yo without a recipient.') def test_send_yo_with_link_and_location_errors(self): """ @@ -80,8 +80,8 @@ def test_send_yo_with_link_and_location_errors(self): 'api_key': 'A1234567890', 'link': 'https://example.com/test', 'location': '12 3rd St'}).encode("utf-8"))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['error'], 'Can\'t send Yo with location and link.') + self.assertEqual(resp.code, 400) + self.assertEqual(data['error'], 'Can\'t send Yo with location and link.') def test_check_username_missing_username_errors(self): """ @@ -89,8 +89,8 @@ def test_check_username_missing_username_errors(self): """ (resp, data) = self.successResultOf(json_request( self, self.root, b"GET", '{0}/check_username/'.format(self.uri))) - self.assertEquals(resp.code, 400) - self.assertEquals(data['error'], 'Must supply username') + self.assertEqual(resp.code, 400) + self.assertEqual(data['error'], 'Must supply username') def test_check_existing_username_is_true(self): """ @@ -100,11 +100,11 @@ def test_check_existing_username_is_true(self): self, self.root, b"POST", '{0}/yo/'.format(self.uri), json.dumps({'username': 'TESTUSER4', 'api_key': 'A1234567890'}).encode("utf-8"))) - self.assertEquals(resp.code, 200) + self.assertEqual(resp.code, 200) (resp, data) = self.successResultOf(json_request( self, self.root, b"GET", '{0}/check_username/?username=TESTUSER4'.format(self.uri))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['exists'], True) + self.assertEqual(resp.code, 200) + self.assertEqual(data['exists'], True) def test_check_non_existing_username_is_false(self): """ @@ -112,5 +112,5 @@ def test_check_non_existing_username_is_false(self): """ (resp, data) = self.successResultOf(json_request( self, self.root, b"GET", '{0}/check_username/?username=TESTUSER5'.format(self.uri))) - self.assertEquals(resp.code, 200) - self.assertEquals(data['exists'], False) + self.assertEqual(resp.code, 200) + self.assertEqual(data['exists'], False) diff --git a/mimic/util/helper.py b/mimic/util/helper.py index 71cebb284d..372fe1ff38 100644 --- a/mimic/util/helper.py +++ b/mimic/util/helper.py @@ -6,7 +6,7 @@ :var fmt: strftime format for datetimes used in JSON. """ -from __future__ import absolute_import, division, unicode_literals + import binascii import os diff --git a/requirements/production.txt b/requirements/production.txt index 6bababfbd9..4d9f7e101a 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -5,7 +5,7 @@ attrs==16.3.0 cffi==1.9.1 coverage==4.3.4 -cryptography==1.7.2 +cryptography==3.2.1 ddt==1.1.1 enum34==1.1.6 extras==1.0.0 @@ -30,4 +30,4 @@ unittest2==1.1.0 Werkzeug==0.11.15 wheel==0.29.0 xmltodict==0.10.2 -zope.interface==4.3.3 +zope.interface==5.5.2 diff --git a/requirements/spellcheck.txt b/requirements/spellcheck.txt index 2c2733ed49..3edec56005 100644 --- a/requirements/spellcheck.txt +++ b/requirements/spellcheck.txt @@ -3,5 +3,5 @@ # 'documentation.txt' because this has the native dependency of 'libenchant' # and may cause problems for some contributors to get set up locally. -pyenchant==1.6.8 +pyenchant==3.2.2 sphinxcontrib-spelling==2.3.0 diff --git a/requirements/toolchain.txt b/requirements/toolchain.txt index 6a246a24b5..6b64ade5d3 100644 --- a/requirements/toolchain.txt +++ b/requirements/toolchain.txt @@ -3,7 +3,7 @@ coverage==4.3.4 detox==0.10.0 eventlet==0.20.1 -greenlet==0.4.12 +greenlet==2.0.1 pluggy==0.4.0 py==1.4.32 tox==2.6.0 diff --git a/setup.py b/setup.py index 87f0f2a918..d411e7f9c6 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ """ Setup file for mimic """ -from __future__ import print_function + from setuptools import setup, find_packages