Admin - Move internal EC2 models (#5090)

moto/batch/models.py

@@ -25,8 +25,8 @@ from .utils import (
     lowercase_first_key,
 )
 from moto.ec2.exceptions import InvalidSubnetIdError
-from moto.ec2._models.instance_types import INSTANCE_TYPES as EC2_INSTANCE_TYPES
-from moto.ec2._models.instance_types import INSTANCE_FAMILIES as EC2_INSTANCE_FAMILIES
+from moto.ec2.models.instance_types import INSTANCE_TYPES as EC2_INSTANCE_TYPES
+from moto.ec2.models.instance_types import INSTANCE_FAMILIES as EC2_INSTANCE_FAMILIES
 from moto.iam.exceptions import IAMNotFoundException
 from moto.core import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
 from moto.core.utils import unix_time_millis, BackendDict

moto/cloudformation/parsing.py

@@ -23,7 +23,7 @@ from moto.cloudwatch import models  # noqa  # pylint: disable=all
 from moto.datapipeline import models  # noqa  # pylint: disable=all
 from moto.dynamodb import models  # noqa  # pylint: disable=all
 from moto.ec2 import models as ec2_models
-from moto.ec2._models.core import TaggedEC2Resource
+from moto.ec2.models.core import TaggedEC2Resource
 from moto.ecr import models  # noqa  # pylint: disable=all
 from moto.ecs import models  # noqa  # pylint: disable=all
 from moto.efs import models  # noqa  # pylint: disable=all

moto/ec2/models/__init__.py

@@ -1,54 +1,54 @@
 from moto.core import ACCOUNT_ID
 from moto.core import BaseBackend
 from moto.core.utils import BackendDict
-from .exceptions import (
+from ..exceptions import (
     EC2ClientError,
     InvalidID,
     MissingParameterError,
     MotoNotImplementedError,
 )
-from ._models.amis import AmiBackend
-from ._models.carrier_gateways import CarrierGatewayBackend
-from ._models.customer_gateways import CustomerGatewayBackend
-from ._models.dhcp_options import DHCPOptionsSetBackend
-from ._models.elastic_block_store import EBSBackend
-from ._models.elastic_ip_addresses import ElasticAddressBackend
-from ._models.elastic_network_interfaces import NetworkInterfaceBackend
-from ._models.flow_logs import FlowLogsBackend
-from ._models.key_pairs import KeyPairBackend
-from ._models.launch_templates import LaunchTemplateBackend
-from ._models.managed_prefixes import ManagedPrefixListBackend
-from ._models.iam_instance_profile import IamInstanceProfileAssociationBackend
-from ._models.internet_gateways import (
+from .amis import AmiBackend
+from .carrier_gateways import CarrierGatewayBackend
+from .customer_gateways import CustomerGatewayBackend
+from .dhcp_options import DHCPOptionsSetBackend
+from .elastic_block_store import EBSBackend
+from .elastic_ip_addresses import ElasticAddressBackend
+from .elastic_network_interfaces import NetworkInterfaceBackend
+from .flow_logs import FlowLogsBackend
+from .key_pairs import KeyPairBackend
+from .launch_templates import LaunchTemplateBackend
+from .managed_prefixes import ManagedPrefixListBackend
+from .iam_instance_profile import IamInstanceProfileAssociationBackend
+from .internet_gateways import (
     InternetGatewayBackend,
     EgressOnlyInternetGatewayBackend,
 )
-from ._models.instances import InstanceBackend
-from ._models.instance_types import InstanceTypeBackend, InstanceTypeOfferingBackend
-from ._models.nat_gateways import NatGatewayBackend
-from ._models.network_acls import NetworkAclBackend
-from ._models.availability_zones_and_regions import RegionsAndZonesBackend
-from ._models.route_tables import RouteBackend, RouteTableBackend
-from ._models.security_groups import SecurityGroupBackend
-from ._models.spot_requests import (
+from .instances import InstanceBackend
+from .instance_types import InstanceTypeBackend, InstanceTypeOfferingBackend
+from .nat_gateways import NatGatewayBackend
+from .network_acls import NetworkAclBackend
+from .availability_zones_and_regions import RegionsAndZonesBackend
+from .route_tables import RouteBackend, RouteTableBackend
+from .security_groups import SecurityGroupBackend
+from .spot_requests import (
     SpotRequestBackend,
     SpotPriceBackend,
     SpotFleetBackend,
 )
-from ._models.subnets import SubnetBackend, SubnetRouteTableAssociationBackend
-from ._models.tags import TagBackend
-from ._models.transit_gateway import TransitGatewayBackend
-from ._models.transit_gateway_route_tables import (
+from .subnets import SubnetBackend, SubnetRouteTableAssociationBackend
+from .tags import TagBackend
+from .transit_gateway import TransitGatewayBackend
+from .transit_gateway_route_tables import (
     TransitGatewayRelationsBackend,
     TransitGatewayRouteTableBackend,
 )
-from ._models.transit_gateway_attachments import TransitGatewayAttachmentBackend
-from ._models.vpn_gateway import VpnGatewayBackend
-from ._models.vpn_connections import VPNConnectionBackend
-from ._models.vpcs import VPCBackend
-from ._models.vpc_peering_connections import VPCPeeringConnectionBackend
-from ._models.vpc_service_configuration import VPCServiceConfigurationBackend
-from .utils import (
+from .transit_gateway_attachments import TransitGatewayAttachmentBackend
+from .vpn_gateway import VpnGatewayBackend
+from .vpn_connections import VPNConnectionBackend
+from .vpcs import VPCBackend
+from .vpc_peering_connections import VPCPeeringConnectionBackend
+from .vpc_service_configuration import VPCServiceConfigurationBackend
+from ..utils import (
     EC2_RESOURCE_TO_PREFIX,
     is_valid_resource_id,
     get_prefix,

moto/ec2/models/core.py

@@ -4,7 +4,7 @@ from ..exceptions import FilterNotImplementedError
 
 
 class TaggedEC2Resource(BaseModel):
-    def get_tags(self, *args, **kwargs):
+    def get_tags(self):
         tags = []
         if self.id:
             tags = self.ec2_backend.describe_tags(filters={"resource-id": [self.id]})

moto/ec2/models/vpcs.py

@@ -472,8 +472,7 @@ class VPCBackend(object):
                         self.delete_route(route_table.id, response.get("cidr_block"))
             if response:
                 return response
-        else:
-            raise InvalidVpcCidrBlockAssociationIdError(association_id)
+        raise InvalidVpcCidrBlockAssociationIdError(association_id)
 
     def associate_vpc_cidr_block(
         self, vpc_id, cidr_block, amazon_provided_ipv6_cidr_block

tests/test_ec2/test_amis.py

@@ -7,7 +7,7 @@ import random
 
 from moto import mock_ec2
 from moto.ec2.models import OWNER_ID
-from moto.ec2._models.amis import AMIS
+from moto.ec2.models.amis import AMIS
 from moto.core import ACCOUNT_ID
 from tests import EXAMPLE_AMI_ID, EXAMPLE_AMI_PARAVIRTUAL
 from uuid import uuid4