openstack
/
fuel-ostf
Code Issues Proposed changes

Obsolete code removed 

Code of adapter_utils module removed from repo as it is not needed any
more.

Entry points for deleted code were removed from console scripts section
of setup.py file.

Change-Id: I29164fed60903feb472c772cade6ad47af392c89
Closes-Bug: #1405196
This commit is contained in:
Artem Roma 2014-12-23 16:47:58 +02:00
parent bd260be07a
commit 8aff1361ed
8 changed files with 0 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
adapter_utils/__init__.py
View File

@ -1,15 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2013 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

15
adapter_utils/bin/__init__.py
View File

@ -1,15 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2013 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

26
adapter_utils/bin/ostf_utils.py
View File

@ -1,26 +0,0 @@
# Copyright 2013 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from adapter_utils.cli_client import parse_cli_args
from adapter_utils import support_utils
def main():
cli_args = parse_cli_args()
support_utils.clean_up_db(cli_args.dbpath)
if __name__ == '__main__':
main()

29
adapter_utils/cli_client.py
View File

@ -1,29 +0,0 @@
# Copyright 2013 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import argparse
import sys
def parse_cli_args():
parser = argparse.ArgumentParser()
subparsers = parser.add_subparsers()
cleandb_parser = subparsers.add_parser('cleandb')
cleandb_parser.add_argument(
'--dbpath',
default='postgresql+psycopg2://ostf:ostf@localhost/ostf'
)
return parser.parse_args(sys.argv[1:])

15
adapter_utils/storage/__init__.py
View File

@ -1,15 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2013 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

44
adapter_utils/storage/engine.py
View File

@ -1,44 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2013 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker
_ENGINE = None
_MAKER = None
def get_session(db_path):
global _ENGINE
global _MAKER
if _MAKER is None:
engine = get_engine(db_path)
_MAKER = sessionmaker(bind=engine, autocommit=True,
expire_on_commit=False)
session = _MAKER()
return session
def get_engine(db_path):
global _ENGINE
if _ENGINE is None:
_ENGINE = create_engine(db_path)
return _ENGINE

28
adapter_utils/support_utils.py
View File

@ -1,28 +0,0 @@
# Copyright 2013 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from sqlalchemy.ext.declarative import declarative_base
from adapter_utils.storage.engine import get_session, get_engine
from fuel_plugin.ostf_adapter.storage import models
def clean_up_db(db_path):
Base = declarative_base()
Base.metadata.reflect(bind=get_engine(db_path))
session = get_session(db_path)
with session.begin(subtransactions=True):
session.query(models.TestSet).delete()
session.query(models.ClusterState).delete()

3
setup.py
View File

@ -60,9 +60,6 @@ setuptools.setup(
],
'console_scripts': [
'ostf-server = fuel_plugin.ostf_adapter.server:main',
('update-commands = fuel_plugin.tests.'
'test_utils.update_commands:main'),
'ostfctl = adapter_utils.bin.ostf_utils:main'
]
},