diff --git a/src/logs.py b/src/com/logs.py similarity index 100% rename from src/logs.py rename to src/com/logs.py diff --git a/src/manage.py b/src/com/manage.py similarity index 100% rename from src/manage.py rename to src/com/manage.py diff --git a/src/com/migrations/README b/src/com/migrations/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/src/com/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/src/com/migrations/alembic.ini b/src/com/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/src/com/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/src/com/migrations/env.py b/src/com/migrations/env.py new file mode 100644 index 0000000..4593816 --- /dev/null +++ b/src/com/migrations/env.py @@ -0,0 +1,87 @@ +from __future__ import with_statement +from alembic import context +from sqlalchemy import engine_from_config, pool +from logging.config import fileConfig +import logging + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from flask import current_app +config.set_main_option('sqlalchemy.url', + current_app.config.get('SQLALCHEMY_DATABASE_URI')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure(url=url) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.readthedocs.org/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + engine = engine_from_config(config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool) + + connection = engine.connect() + context.configure(connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args) + + try: + with context.begin_transaction(): + context.run_migrations() + finally: + connection.close() + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/src/com/migrations/script.py.mako b/src/com/migrations/script.py.mako new file mode 100644 index 0000000..9570201 --- /dev/null +++ b/src/com/migrations/script.py.mako @@ -0,0 +1,22 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision} +Create Date: ${create_date} + +""" + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/src/com/migrations/versions/37dcfdb2604_.py b/src/com/migrations/versions/37dcfdb2604_.py new file mode 100644 index 0000000..c746d1c --- /dev/null +++ b/src/com/migrations/versions/37dcfdb2604_.py @@ -0,0 +1,116 @@ +"""empty message + +Revision ID: 37dcfdb2604 +Revises: None +Create Date: 2018-04-22 11:58:48.307690 + +""" + +# revision identifiers, used by Alembic. +revision = '37dcfdb2604' +down_revision = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_table('apply_msg', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('username', sa.String(length=10), nullable=True), + sa.Column('number', sa.Integer(), nullable=True), + sa.Column('reason', sa.String(length=600), nullable=True), + sa.Column('status', sa.String(length=10), nullable=True), + sa.Column('time', sa.DateTime(timezone=10), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('image', + sa.Column('imagename', sa.String(length=50), nullable=True), + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('hasPrivate', sa.Boolean(), nullable=True), + sa.Column('hasPublic', sa.Boolean(), nullable=True), + sa.Column('ownername', sa.String(length=20), nullable=True), + sa.Column('create_time', sa.DateTime(), nullable=True), + sa.Column('description', sa.Text(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('v_cluster', + sa.Column('clusterid', sa.BigInteger(), autoincrement=False, nullable=False), + sa.Column('clustername', sa.String(length=50), nullable=True), + sa.Column('ownername', sa.String(length=20), nullable=True), + sa.Column('status', sa.String(length=10), nullable=True), + sa.Column('size', sa.Integer(), nullable=True), + sa.Column('nextcid', sa.Integer(), nullable=True), + sa.Column('create_time', sa.DateTime(), nullable=True), + sa.Column('start_time', sa.String(length=20), nullable=True), + sa.Column('proxy_server_ip', sa.String(length=20), nullable=True), + sa.Column('proxy_public_ip', sa.String(length=20), nullable=True), + sa.PrimaryKeyConstraint('clusterid') + ) + op.create_table('v_node', + sa.Column('name', sa.String(length=100), nullable=False), + sa.Column('laststopcpuval', sa.Float(), nullable=True), + sa.Column('laststopruntime', sa.Integer(), nullable=True), + sa.Column('billing', sa.Integer(), nullable=True), + sa.PrimaryKeyConstraint('name') + ) + op.create_table('billing_history', + sa.Column('node_name', sa.String(length=100), nullable=False), + sa.Column('vclusterid', sa.Integer(), nullable=True), + sa.Column('cpu', sa.Float(), nullable=True), + sa.Column('mem', sa.Float(), nullable=True), + sa.Column('disk', sa.Float(), nullable=True), + sa.Column('port', sa.Float(), nullable=True), + sa.ForeignKeyConstraint(['vclusterid'], ['v_cluster.clusterid'], ), + sa.PrimaryKeyConstraint('node_name') + ) + op.create_table('container', + sa.Column('containername', sa.String(length=100), nullable=False), + sa.Column('hostname', sa.String(length=30), nullable=True), + sa.Column('ip', sa.String(length=20), nullable=True), + sa.Column('host', sa.String(length=20), nullable=True), + sa.Column('image', sa.String(length=50), nullable=True), + sa.Column('lastsave', sa.DateTime(), nullable=True), + sa.Column('setting_cpu', sa.Integer(), nullable=True), + sa.Column('setting_mem', sa.Integer(), nullable=True), + sa.Column('setting_disk', sa.Integer(), nullable=True), + sa.Column('vclusterid', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['vclusterid'], ['v_cluster.clusterid'], ), + sa.PrimaryKeyConstraint('containername') + ) + op.create_table('history', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('vnode', sa.String(length=100), nullable=True), + sa.Column('action', sa.String(length=30), nullable=True), + sa.Column('runningtime', sa.Integer(), nullable=True), + sa.Column('cputime', sa.Float(), nullable=True), + sa.Column('billing', sa.Integer(), nullable=True), + sa.Column('actionTime', sa.DateTime(), nullable=True), + sa.ForeignKeyConstraint(['vnode'], ['v_node.name'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('port_mapping', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('node_name', sa.String(length=100), nullable=True), + sa.Column('node_ip', sa.String(length=20), nullable=True), + sa.Column('node_port', sa.Integer(), nullable=True), + sa.Column('host_port', sa.Integer(), nullable=True), + sa.Column('vclusterid', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['vclusterid'], ['v_cluster.clusterid'], ), + sa.PrimaryKeyConstraint('id') + ) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_table('port_mapping') + op.drop_table('history') + op.drop_table('container') + op.drop_table('billing_history') + op.drop_table('v_node') + op.drop_table('v_cluster') + op.drop_table('image') + op.drop_table('apply_msg') + ### end Alembic commands ### diff --git a/src/beansapplicationmgr.py b/src/master/beansapplicationmgr.py similarity index 100% rename from src/beansapplicationmgr.py rename to src/master/beansapplicationmgr.py diff --git a/src/cloudmgr.py b/src/master/cloudmgr.py similarity index 100% rename from src/cloudmgr.py rename to src/master/cloudmgr.py diff --git a/src/deploy.py b/src/master/deploy.py similarity index 100% rename from src/deploy.py rename to src/master/deploy.py diff --git a/src/httprest.py b/src/master/httprest.py similarity index 100% rename from src/httprest.py rename to src/master/httprest.py diff --git a/src/lockmgr.py b/src/master/lockmgr.py similarity index 100% rename from src/lockmgr.py rename to src/master/lockmgr.py diff --git a/src/nodemgr.py b/src/master/nodemgr.py similarity index 100% rename from src/nodemgr.py rename to src/master/nodemgr.py diff --git a/src/notificationmgr.py b/src/master/notificationmgr.py similarity index 100% rename from src/notificationmgr.py rename to src/master/notificationmgr.py diff --git a/src/settings.py b/src/master/settings.py similarity index 100% rename from src/settings.py rename to src/master/settings.py diff --git a/src/sysmgr.py b/src/master/sysmgr.py similarity index 100% rename from src/sysmgr.py rename to src/master/sysmgr.py diff --git a/src/userManager.py b/src/master/userManager.py similarity index 100% rename from src/userManager.py rename to src/master/userManager.py diff --git a/src/userinit.sh b/src/master/userinit.sh similarity index 100% rename from src/userinit.sh rename to src/master/userinit.sh diff --git a/src/vclustermgr.py b/src/master/vclustermgr.py similarity index 100% rename from src/vclustermgr.py rename to src/master/vclustermgr.py