Skip to content

Commit 7d7c3fc

Browse files
committed
Remove fs and swift repository classes as this is now part of the
Package Repository
1 parent 35fe0f7 commit 7d7c3fc

File tree

6 files changed

+6
-304
lines changed

6 files changed

+6
-304
lines changed

api/src/main/resources/app.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from deployer_system_test import DeployerRestClientTester
4040
from exceptiondef import NotFound, ConflictingState, FailedValidation, FailedCreation
4141
from async_dispatcher import AsyncDispatcher
42-
from package_repo_rest_client import PacakgeRepoRestClient
42+
from package_repo_rest_client import PackageRepoRestClient
4343

4444
options.logging = None
4545

@@ -298,9 +298,8 @@ def main():
298298

299299
deployer_utils.fill_hadoop_env(config['environment'])
300300

301-
package_repository = PacakgeRepoRestClient(config['config']["package_repository"])
302-
repo = repository.SwiftRepository(package_repository)
303-
dm = deployment_manager.DeploymentManager(repo,
301+
package_repository = PackageRepoRestClient(config['config']["package_repository"])
302+
dm = deployment_manager.DeploymentManager(package_repository,
304303
package_registrar.HbasePackageRegistrar(
305304
config['environment']['hbase_rest_server']),
306305
application_registrar.HbaseApplicationRegistrar(

api/src/main/resources/deployment_manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def _assert_package_status(self, package, required_status):
7676

7777
def list_repository(self, recency):
7878
logging.info("list_available: %s", recency)
79-
available = self._repository.list_packages(recency)
79+
available = self._repository.get_package_list(recency)
8080
return available
8181

8282
def get_package_info(self, package):
@@ -155,7 +155,7 @@ def _do_deploy():
155155
package_file = package + '.tar.gz'
156156
logging.info("deploy: %s", package)
157157
# download package:
158-
package_data = self._repository.download_package(package_file)
158+
package_data = self._repository.get_package(package_file)
159159
# put package in database:
160160
metadata = self._package_parser.get_package_metadata(package_data)
161161
self._application_creator.validate_package(package, metadata)

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
{
2-
"FsRepository": {
3-
"container": {
4-
"path": "/tmp/packages/"
5-
}
6-
},
72
"HDFSRegistrar": {
83
"records_path": "user/deployment/record.json",
94
"webhdfs_user": "hdfs"

api/src/main/resources/package_repo_rest_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from exceptiondef import NotFound
2525

2626

27-
class PacakgeRepoRestClient(object):
27+
class PackageRepoRestClient(object):
2828
def __init__(self, api_url):
2929
"""
3030
A client implementation for the package repository API

api/src/main/resources/repository.py

Lines changed: 0 additions & 102 deletions
This file was deleted.

api/src/main/resources/test_repository.py

Lines changed: 0 additions & 190 deletions
This file was deleted.

0 commit comments

Comments
 (0)