Merge pull request #6 from pndaproject/PNDA-2198

Clean up and remove old FS repository

Author: jeclarke

api/src/main/resources/app.py

@@ -31,15 +31,14 @@
 from tornado.web import asynchronous
 from tornado.options import define, options
 
-import repository
 import package_registrar
 import application_registrar
 import deployer_utils
 import deployment_manager
 from deployer_system_test import DeployerRestClientTester
 from exceptiondef import NotFound, ConflictingState, FailedValidation, FailedCreation
 from async_dispatcher import AsyncDispatcher
-from package_repo_rest_client import PacakgeRepoRestClient
+from package_repo_rest_client import PackageRepoRestClient
 
 options.logging = None
 
@@ -298,9 +297,8 @@ def main():
 
     deployer_utils.fill_hadoop_env(config['environment'])
 
-    package_repository = PacakgeRepoRestClient(config['config']["package_repository"])
-    repo = repository.SwiftRepository(package_repository)
-    dm = deployment_manager.DeploymentManager(repo,
+    package_repository = PackageRepoRestClient(config['config']["package_repository"])
+    dm = deployment_manager.DeploymentManager(package_repository,
                                               package_registrar.HbasePackageRegistrar(
                                                   config['environment']['hbase_rest_server']),
                                               application_registrar.HbaseApplicationRegistrar(

api/src/main/resources/deployment_manager.py

@@ -76,7 +76,7 @@ def _assert_package_status(self, package, required_status):
 
     def list_repository(self, recency):
         logging.info("list_available: %s", recency)
-        available = self._repository.list_packages(recency)
+        available = self._repository.get_package_list(recency)
         return available
 
     def get_package_info(self, package):
@@ -155,7 +155,7 @@ def _do_deploy():
                 package_file = package + '.tar.gz'
                 logging.info("deploy: %s", package)
                 # download package:
-                package_data = self._repository.download_package(package_file)
+                package_data = self._repository.get_package(package_file)
                 # put package in database:
                 metadata = self._package_parser.get_package_metadata(package_data)
                 self._application_creator.validate_package(package, metadata)

api/src/main/resources/dm-config.json

@@ -1,9 +1,4 @@
 {
-    "FsRepository": {
-        "container": {
-            "path": "/tmp/packages/"
-        }
-    },
     "HDFSRegistrar": {
         "records_path": "user/deployment/record.json",
         "webhdfs_user": "hdfs"

api/src/main/resources/package_repo_rest_client.py

@@ -24,7 +24,7 @@
 from  exceptiondef import NotFound
 
 
-class PacakgeRepoRestClient(object):
+class PackageRepoRestClient(object):
     def __init__(self, api_url):
         """
         A client implementation for the package repository API

api/src/main/resources/repository.py

@@ -551,7 +551,7 @@ def test_deploy_package(self):
         package_callback_name = "package_callback"
         self.mock_config[package_callback_name] = package_callback_name
         self.mock_package_registar.self.package_exists = Mock(return_value=False)
-        self.mock_repository.download_package.return_value = 'abcd'
+        self.mock_repository.get_package.return_value = 'abcd'
 
         class MockDeploymentManager(DeploymentManager):
             def create_mocks(self):
@@ -629,7 +629,7 @@ def test_list_repository(self):
         }]
 
         repository = Mock()
-        repository.list_packages.return_value = expected_packages
+        repository.get_package_list.return_value = expected_packages
 
         package_registrar = Mock()
         application_registrar = Mock()