Merge "Added uuid field into Node model"

nailgun/nailgun/api/handlers/node.py

@@ -49,7 +49,7 @@ class NodeHandler(BaseHandler):
     fields = ('id', 'name', 'meta', 'progress', 'roles', 'pending_roles',
               'status', 'mac', 'fqdn', 'ip', 'manufacturer', 'platform_name',
               'pending_addition', 'pending_deletion', 'os_platform',
-              'error_type', 'online', 'cluster')
+              'error_type', 'online', 'cluster', 'uuid')
     model = Node
     validator = NodeValidator
 
@@ -162,7 +162,7 @@ class NodeCollectionHandler(BaseHandler):
     fields = ('id', 'name', 'meta', 'progress', 'roles', 'pending_roles',
               'status', 'mac', 'fqdn', 'ip', 'manufacturer', 'platform_name',
               'pending_addition', 'pending_deletion', 'os_platform',
-              'error_type', 'online', 'cluster')
+              'error_type', 'online', 'cluster', 'uuid')
 
     validator = NodeValidator
 

nailgun/nailgun/db/migration/alembic_migrations/versions/current.py

@@ -12,7 +12,6 @@ down_revision = '3540e7a3ba1e'
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
 
 from nailgun.db.sqlalchemy.models.fields import JSON
 from nailgun.db.sqlalchemy.models.fields import LowercaseString
@@ -86,6 +85,12 @@ def upgrade_enum(table, column_name, enum_name, old_options, new_options):
     ### end Alembic commands ###
 
 
+def drop_enum(name):
+    op.execute(
+        u'DROP TYPE {0}'.format(name)
+    )
+
+
 def upgrade():
     ### commands auto generated by Alembic - please adjust! ###
     op.drop_table('global_parameters')
@@ -182,6 +187,11 @@ def upgrade():
         'agent_checksum', sa.String(40), nullable=True
     ))
 
+    op.add_column('nodes', sa.Column(
+        'uuid', sa.String(length=36), nullable=False
+    ))
+    op.create_unique_constraint("uq_node_uuid", "nodes", ["uuid"])
+
     ### end Alembic commands ###
 
 
@@ -195,94 +205,42 @@ def downgrade():
     )
     op.create_table(
         'global_parameters',
-        sa.Column(
-            'id',
-            sa.INTEGER(),
-            server_default="nextval('global_parameters_id_seq'::regclass)",
-            nullable=False
-        ),
-        sa.Column(
-            'parameters',
-            sa.TEXT(),
-            autoincrement=False,
-            nullable=True
-        ),
-        sa.PrimaryKeyConstraint(
-            'id',
-            name=u'global_parameters_pkey'
-        )
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('parameters', JSON(), nullable=True),
+        sa.PrimaryKeyConstraint('id')
     )
     op.drop_column('network_groups', 'meta')
     op.create_table(
         'allowed_networks',
-        sa.Column(
-            'id',
-            sa.INTEGER(),
-            server_default="nextval('allowed_networks_id_seq'::regclass)",
-            nullable=False
-        ),
-        sa.Column(
-            'network_id',
-            sa.INTEGER(),
-            autoincrement=False,
-            nullable=False
-        ),
-        sa.Column(
-            'interface_id',
-            sa.INTEGER(),
-            autoincrement=False,
-            nullable=False
-        ),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('network_id', sa.Integer(), nullable=False),
+        sa.Column('interface_id', sa.Integer(), nullable=False),
         sa.ForeignKeyConstraint(
             ['interface_id'],
-            [u'node_nic_interfaces.id'],
-            name=u'allowed_networks_interface_id_fkey',
-            ondelete=u'CASCADE'
+            ['node_nic_interfaces.id'],
+            ondelete='CASCADE'
         ),
         sa.ForeignKeyConstraint(
             ['network_id'],
-            [u'network_groups.id'],
-            name=u'allowed_networks_network_id_fkey',
-            ondelete=u'CASCADE'
+            ['network_groups.id'],
+            ondelete='CASCADE'
         ),
-        sa.PrimaryKeyConstraint(
-            'id',
-            name=u'allowed_networks_pkey'
-        )
+        sa.PrimaryKeyConstraint('id')
     )
+    drop_enum('plugin_type')
     op.create_table(
         'plugins',
-        sa.Column(
-            'id',
-            sa.INTEGER(),
-            server_default="nextval('plugins_id_seq'::regclass)",
-            nullable=False
-        ),
+        sa.Column('id', sa.Integer(), nullable=False),
         sa.Column(
             'type',
-            postgresql.ENUM(u'nailgun', u'fuel', name='plugin_type'),
-            autoincrement=False,
+            sa.Enum('nailgun', 'fuel', name='plugin_type'),
             nullable=False
         ),
-        sa.Column(
-            'name',
-            sa.VARCHAR(length=128),
-            autoincrement=False,
-            nullable=False
-        ),
-        sa.Column(
-            'state',
-            sa.VARCHAR(length=128),
-            autoincrement=False,
-            nullable=False
-        ),
-        sa.Column(
-            'version',
-            sa.VARCHAR(length=128),
-            autoincrement=False,
-            nullable=False
-        ),
-        sa.PrimaryKeyConstraint('id', name=u'plugins_pkey')
+        sa.Column('name', sa.String(length=128), nullable=False),
+        sa.Column('state', sa.String(length=128), nullable=False),
+        sa.Column('version', sa.String(length=128), nullable=False),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('name')
     )
     # CLUSTER STATUS ENUM DOWNGRADE
     upgrade_enum(
@@ -312,5 +270,7 @@ def downgrade():
     )
     op.drop_table('net_bond_assignments')
     op.drop_table('node_bond_interfaces')
+    drop_enum('bond_mode')
     op.drop_column('nodes', 'agent_checksum')
+    op.drop_column('nodes', 'uuid')
     ### end Alembic commands ###

nailgun/nailgun/db/sqlalchemy/models/node.py

@@ -14,6 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import uuid
+
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import DateTime
@@ -80,6 +82,8 @@ class Node(Base):
         'deletion'
     )
     id = Column(Integer, primary_key=True)
+    uuid = Column(String(36), nullable=False,
+                  default=lambda: str(uuid.uuid4()), unique=True)
     cluster_id = Column(Integer, ForeignKey('clusters.id'))
     name = Column(Unicode(100))
     status = Column(