Provide names for all Enums used in migration

aim/db/agent_model.py

@@ -32,7 +32,7 @@ class Agent(model_base.Base, model_base.HasId, model_base.AttributeMixin):
 
     __table_args__ = (
         sa.UniqueConstraint('agent_type', 'host',
-                            name='uniq_agents0agent_type0host'),
+                            name='aim_agents_uniq_agents0agent_type0host'),
         model_base.Base.__table_args__
     )
 

aim/db/infra_model.py

@@ -145,7 +145,9 @@ class HostDomainMappingV2(model_base.Base, model_base.AttributeMixin):
     domain_type = sa.Column(sa.Enum('PhysDom',
                                     'OpenStack',
                                     'Kubernetes',
-                                    'VMware'), primary_key=True)
+                                    'VMware',
+                                    name='enum_domain_type'),
+                                    primary_key=True)
 
 
 class HostLinkNetworkLabel(model_base.Base, model_base.AttributeMixin):

aim/db/migration/alembic_migrations/versions/310941aa5ee1_device_cluster_vmm.py

@@ -30,16 +30,27 @@
 from alembic import op
 import sqlalchemy as sa
 
+from sqlalchemy.dialects import postgresql
+
 
 def upgrade():
 
     op.add_column(
         'aim_device_clusters',
         sa.Column('vmm_domain_name', sa.String(64)))
+
+    try:
+        domain_type = postgresql.ENUM('OpenStack', 'Kubernetes' 'VMware', '',
+                                      name='enum_vmm_domain_type')
+        domain_type.create(op.get_bind())
+    except Exception:
+        # DB other than postgresql can fail here.
+        pass
     op.add_column(
         'aim_device_clusters',
         sa.Column('vmm_domain_type', sa.Enum('OpenStack', 'Kubernetes',
-                                             'VMware', '')))
+                                             'VMware', '',
+                                             name='enum_vmm_domain_type')))
 
 
 def downgrade():

aim/db/migration/alembic_migrations/versions/3ef7607a41b0_contracts.py

@@ -113,7 +113,9 @@ def upgrade():
         'aim_contract_subject_filters',
         sa.Column('subject_aim_id', sa.Integer, nullable=False),
         sa.Column('name', sa.String(64), nullable=False),
-        sa.Column('direction', sa.Enum('bi', 'in', 'out'), nullable=False),
+        sa.Column('direction', sa.Enum('bi', 'in', 'out',
+                  name='enum_aim_contract_subject_filters_direction'),
+                  nullable=False),
         sa.PrimaryKeyConstraint('subject_aim_id', 'name', 'direction'),
         sa.ForeignKeyConstraint(
             ['subject_aim_id'], ['aim_contract_subjects.aim_id']))

aim/db/migration/alembic_migrations/versions/4abf11e33ef1_vmm_type_enum.py

@@ -35,7 +35,8 @@ def upgrade():
     with op.batch_alter_table('aim_device_clusters') as batch_op:
         batch_op.alter_column(
             "vmm_domain_type", existing_type=sa.Enum('OpenStack', 'Kubernetes',
-                                                     'VMware', ''),
+                                                     'VMware', '',
+                                                     name='enum_vmm_domain_type'),
             type_=sa.String(64))
 
 

aim/db/migration/alembic_migrations/versions/5d975a5c2d60_vmm_injected_objects.py

@@ -42,11 +42,11 @@ def upgrade():
         sa.Column('monitored', sa.Boolean, nullable=False, default=False),
         sa.Column('scope', sa.Enum('unmanaged', 'vm', 'iaas', 'network',
                                    'MicrosoftSCVMM', 'openstack',
-                                   'kubernetes')),
+                                   'kubernetes', name='enum_scope')),
         sa.Column('root_cont_name', sa.String(64)),
         sa.Column('host_or_ip', sa.String(128)),
         sa.Column('mode', sa.Enum('default', 'n1kv', 'unknown', 'ovs',
-                                  'k8s')),
+                                  'k8s', name='enum_aim_vmm_controllers_mode')),
         sa.PrimaryKeyConstraint('aim_id'),
         sa.UniqueConstraint('domain_type', 'domain_name', 'name',
                             name='uniq_aim_vmm_controllers_identity'),
@@ -134,7 +134,8 @@ def upgrade():
         sa.Column('name', sa.String(64), nullable=False),
         sa.Column('display_name', sa.String(256), nullable=False, default=''),
         sa.Column('service_type', sa.Enum('clusterIp', 'externalName',
-                                          'nodePort', 'loadBalancer')),
+                                          'nodePort', 'loadBalancer',
+                                          name='enum_service_type')),
         sa.Column('cluster_ip', sa.String(64)),
         sa.Column('load_balancer_ip', sa.String(64)),
         sa.PrimaryKeyConstraint('aim_id'),

aim/db/migration/alembic_migrations/versions/5e29ae4f45e6_host_domains_mapping_v2.py

@@ -40,7 +40,8 @@ def upgrade():
         sa.Column('domain_type', sa.Enum('PhysDom',
                                          'OpenStack',
                                          'Kubernetes',
-                                         'VMware')),
+                                         'VMware',
+                                         name='enum_domain_type')),
         sa.PrimaryKeyConstraint('host_name', 'domain_name', 'domain_type')
     )
     session = sa.orm.Session(bind=op.get_bind(), autocommit=True)

aim/db/migration/alembic_migrations/versions/accfe645090a_agent_resource.py

@@ -48,7 +48,7 @@ def upgrade():
         sa.Column('version', sa.String(10)),
         sa.PrimaryKeyConstraint('id'),
         sa.UniqueConstraint('agent_type', 'host',
-                            name='uniq_agents0agent_type0host'))
+                            name='aim_agents_uniq_agents0agent_type0host'))
 
     op.create_table(
         'aim_agent_to_tree_associations',

aim/db/migration/alembic_migrations/versions/aceb1ac13668_vmm_policy.py

@@ -76,15 +76,19 @@ def upgrade():
         sa.Column('aim_id', sa.Integer, autoincrement=True),
         sa.Column('display_name', sa.String(256), nullable=False, default=''),
         sa.Column('monitored', sa.Boolean, nullable=False, default=False),
-        sa.Column('enforcement_pref', sa.Enum('sw', 'hw', 'unknown')),
+        sa.Column('enforcement_pref', sa.Enum('sw', 'hw', 'unknown',
+                                              name='enum_enforcement_type')),
         sa.Column('mode', sa.Enum('default', 'n1kv', 'unknown', 'ovs',
-                                  'k8s')),
+                                  'k8s', name='enum_aim_vmm_domains_mode')),
         sa.Column('mcast_address', sa.String(64)),
-        sa.Column('encap_mode', sa.Enum('unknown', 'vlan', 'vxlan')),
+        sa.Column('encap_mode', sa.Enum('unknown', 'vlan', 'vxlan', 
+                                        name='enum_encap_mode')),
         sa.Column('pref_encap_mode', sa.Enum('unspecified', 'vlan',
-                                             'vxlan')),
+                                             'vxlan',
+                                             name='enum_pref_encap_mode')),
         sa.Column('vlan_pool_name', sa.String(64)),
-        sa.Column('vlan_pool_type', sa.Enum('static', 'dynamic')),
+        sa.Column('vlan_pool_type', sa.Enum('static', 'dynamic',
+                                            name='enum_vlan_pool_type')),
         sa.Column('mcast_addr_pool_name', sa.String(64)),
         sa.PrimaryKeyConstraint('aim_id'),
         sa.UniqueConstraint('type', 'name',

aim/db/migration/alembic_migrations/versions/dc598e78e318_service_graph.py

@@ -43,11 +43,14 @@ def upgrade():
         sa.Column('name', sa.String(64), nullable=False),
         sa.Column('tenant_name', sa.String(64), nullable=False),
         sa.Column('display_name', sa.String(256), nullable=False, default=''),
-        sa.Column('device_type', sa.Enum("PHYSICAL", "VIRTUAL")),
+        sa.Column('device_type', sa.Enum("PHYSICAL", "VIRTUAL",
+                                         name='enum_device_type')),
         sa.Column('service_type',
-                  sa.Enum("ADC", "FW", "OTHERS", "IDSIPS", "COPY")),
+                  sa.Enum("ADC", "FW", "OTHERS", "IDSIPS", "COPY",
+                          name='enum_service_type')),
         sa.Column('context_aware',
-                  sa.Enum("single-Context", "multi-Context")),
+                  sa.Enum("single-Context", "multi-Context",
+                          name='enum_context_aware')),
         sa.Column('managed', sa.Boolean),
         sa.Column('physical_domain_name', sa.String(64)),
         sa.Column('encap', sa.String(24)),
@@ -157,9 +160,13 @@ def upgrade():
         sa.Column('service_graph_name', sa.String(64), nullable=False),
         sa.Column('tenant_name', sa.String(64), nullable=False),
         sa.Column('display_name', sa.String(256), nullable=False, default=''),
-        sa.Column('adjacency_type', sa.Enum('L2', 'L3')),
-        sa.Column('connector_direction', sa.Enum('consumer', 'provider')),
-        sa.Column('connector_type', sa.Enum('internal', 'external')),
+        sa.Column('adjacency_type', sa.Enum('L2', 'L3',
+                                            name='enum_adjacency_type')),
+        sa.Column('connector_direction',
+                  sa.Enum('consumer', 'provider',
+                          name='enum_connector_direction')),
+        sa.Column('connector_type', sa.Enum('internal', 'external',
+                                            name='enum_connector_type')),
         sa.Column('direct_connect', sa.Boolean),
         sa.Column('unicast_route', sa.Boolean),
         sa.Column('monitored', sa.Boolean, nullable=False, default=False),
@@ -188,9 +195,11 @@ def upgrade():
         sa.Column('service_graph_name', sa.String(64), nullable=False),
         sa.Column('tenant_name', sa.String(64), nullable=False),
         sa.Column('display_name', sa.String(256), nullable=False, default=''),
-        sa.Column('function_type', sa.Enum('GoTo', 'GoThrough')),
+        sa.Column('function_type', sa.Enum('GoTo', 'GoThrough',
+                                           name='enum_function_type')),
         sa.Column('managed', sa.Boolean),
-        sa.Column('routing_mode', sa.Enum('unspecified', 'Redirect')),
+        sa.Column('routing_mode', sa.Enum('unspecified', 'Redirect',
+                                          name='enum_routing_mode')),
         sa.Column('device_cluster_name', sa.String(64)),
         sa.Column('device_cluster_tenant_name', sa.String(64)),
         sa.Column('monitored', sa.Boolean, nullable=False, default=False),

aim/db/migration/data_migration/host_domain_mapping_v2.py

@@ -21,7 +21,7 @@
     sa.Column('host_name', sa.String(128)),
     sa.Column('domain_name', sa.String(64)),
     sa.Column('domain_type', sa.Enum('PhysDom', 'OpenStack', 'Kubernetes',
-                                     'VMware'))
+                                     'VMware', name='enum_domain_type'))
 )
 
 HostDomainMapping = sa.Table(

aim/db/models.py

@@ -159,13 +159,18 @@ class VMMDomain(model_base.Base, model_base.HasDisplayName,
                       model_base.to_tuple(model_base.Base.__table_args__))
 
     type = sa.Column(sa.String(64))
-    enforcement_pref = sa.Column(sa.Enum('sw', 'hw', 'unknown'))
-    mode = sa.Column(sa.Enum('default', 'n1kv', 'unknown', 'ovs', 'k8s'))
+    enforcement_pref = sa.Column(sa.Enum('sw', 'hw', 'unknown',
+        name='enum_enforcement_pref'))
+    mode = sa.Column(sa.Enum('default', 'n1kv', 'unknown', 'ovs', 'k8s',
+        name='enum_aim_vmm_domains_mode'))
     mcast_address = sa.Column(sa.String(64))
-    encap_mode = sa.Column(sa.Enum('unknown', 'vlan', 'vxlan'))
-    pref_encap_mode = sa.Column(sa.Enum('unspecified', 'vlan', 'vxlan'))
+    encap_mode = sa.Column(sa.Enum('unknown', 'vlan', 'vxlan',
+        name='enum_encap_mode'))
+    pref_encap_mode = sa.Column(sa.Enum('unspecified', 'vlan', 'vxlan',
+        name='enum_pref_encap_mode'))
     vlan_pool_name = model_base.name_column()
-    vlan_pool_type = sa.Column(sa.Enum('static', 'dynamic'))
+    vlan_pool_type = sa.Column(sa.Enum('static', 'dynamic',
+        name='enum_vlan_pool_type'))
     mcast_addr_pool_name = model_base.name_column()
 
 
@@ -445,7 +450,8 @@ class ContractSubjectFilter(model_base.Base):
                                sa.ForeignKey('aim_contract_subjects.aim_id'),
                                primary_key=True)
     name = model_base.name_column(primary_key=True)
-    direction = sa.Column(sa.Enum('bi', 'in', 'out'), primary_key=True)
+    direction = sa.Column(sa.Enum('bi', 'in', 'out', name='enum_direction'),
+        primary_key=True)
 
 
 class ContractSubject(model_base.Base, model_base.HasAimId,
@@ -889,10 +895,12 @@ class VMMController(model_base.Base, model_base.HasDisplayName,
     domain_type = model_base.name_column(nullable=False)
 
     scope = sa.Column(sa.Enum('unmanaged', 'vm', 'iaas', 'network',
-                              'MicrosoftSCVMM', 'openstack', 'kubernetes'))
+                              'MicrosoftSCVMM', 'openstack', 'kubernetes',
+                              name='enum_scope'))
     root_cont_name = sa.Column(sa.String(64))
     host_or_ip = sa.Column(sa.String(128))
-    mode = sa.Column(sa.Enum('default', 'n1kv', 'unknown', 'ovs', 'k8s'))
+    mode = sa.Column(sa.Enum('default', 'n1kv', 'unknown', 'ovs', 'k8s',
+                             name='enum_aim_vmm_controllers_mode'))
 
 
 class VmmInjectedNamespace(model_base.Base, model_base.HasAimId,
@@ -985,7 +993,8 @@ class VmmInjectedService(model_base.Base, model_base.HasAimId,
     controller_name = model_base.name_column(nullable=False)
     namespace_name = model_base.name_column(nullable=False)
     service_type = sa.Column(sa.Enum('clusterIp', 'externalName',
-                                     'nodePort', 'loadBalancer'))
+                                     'nodePort', 'loadBalancer',
+                                     name='enum_service_type'))
     cluster_ip = sa.Column(sa.String(64))
     load_balancer_ip = sa.Column(sa.String(64))
 

aim/db/service_graph_model.py

@@ -44,9 +44,12 @@ class DeviceCluster(model_base.Base, model_base.HasAimId,
         model_base.uniq_column(__tablename__, 'tenant_name', 'name') +
         model_base.to_tuple(model_base.Base.__table_args__))
 
-    device_type = sa.Column(sa.Enum("PHYSICAL", "VIRTUAL"))
-    service_type = sa.Column(sa.Enum("ADC", "FW", "OTHERS", "IDSIPS", "COPY"))
-    context_aware = sa.Column(sa.Enum("single-Context", "multi-Context"))
+    device_type = sa.Column(sa.Enum("PHYSICAL", "VIRTUAL",
+                                    name='enum_device_type'))
+    service_type = sa.Column(sa.Enum("ADC", "FW", "OTHERS", "IDSIPS", "COPY",
+                                     name='enum_service_type'))
+    context_aware = sa.Column(sa.Enum("single-Context", "multi-Context",
+                                      name='enum_context_aware'))
     managed = sa.Column(sa.Boolean)
     physical_domain_name = model_base.name_column()
     vmm_domain_type = model_base.name_column()
@@ -192,9 +195,12 @@ class ServiceGraphConnection(model_base.Base, model_base.HasAimId,
         model_base.to_tuple(model_base.Base.__table_args__))
 
     service_graph_name = model_base.name_column(nullable=False)
-    adjacency_type = sa.Column(sa.Enum('L2', 'L3'))
-    connector_direction = sa.Column(sa.Enum('consumer', 'provider'))
-    connector_type = sa.Column(sa.Enum('internal', 'external'))
+    adjacency_type = sa.Column(sa.Enum('L2', 'L3',
+                                       name='enum_adjacency_type'))
+    connector_direction = sa.Column(sa.Enum('consumer', 'provider',
+                                            name='enum_connector_direction'))
+    connector_type = sa.Column(sa.Enum('internal', 'external',
+                                       name='enum_connector_type'))
     direct_connect = sa.Column(sa.Boolean)
     unicast_route = sa.Column(sa.Boolean)
 
@@ -247,9 +253,11 @@ class ServiceGraphNode(model_base.Base, model_base.HasAimId,
         model_base.to_tuple(model_base.Base.__table_args__))
 
     service_graph_name = model_base.name_column(nullable=False)
-    function_type = sa.Column(sa.Enum('GoTo', 'GoThrough'))
+    function_type = sa.Column(sa.Enum('GoTo', 'GoThrough',
+                                      name='enum_function_type'))
     managed = sa.Column(sa.Boolean)
-    routing_mode = sa.Column(sa.Enum('unspecified', 'Redirect'))
+    routing_mode = sa.Column(sa.Enum('unspecified', 'Redirect',
+                                     name='enum_routing_mode'))
     device_cluster_name = model_base.name_column()
     device_cluster_tenant_name = model_base.name_column()
     sequence_number = sa.Column(sa.Integer)