diff options
Diffstat (limited to 'sugar_network/node')
| -rw-r--r-- | sugar_network/node/master.py | 8 | ||||
| -rw-r--r-- | sugar_network/node/routes.py | 21 | ||||
| -rw-r--r-- | sugar_network/node/stats_node.py | 8 | ||||
| -rw-r--r-- | sugar_network/node/volume.py | 2 |
4 files changed, 19 insertions, 20 deletions
diff --git a/sugar_network/node/master.py b/sugar_network/node/master.py index 9903fd8..19a8cf1 100644 --- a/sugar_network/node/master.py +++ b/sugar_network/node/master.py @@ -146,14 +146,14 @@ class MasterRoutes(NodeRoutes): def after_post(self, doc): if doc.metadata.name == 'context': - shift_implementations = doc.modified('dependencies') + shift_releases = doc.modified('dependencies') if doc.modified('aliases'): # TODO Already launched job should be killed coroutine.spawn(self._resolve_aliases, doc) - shift_implementations = True - if shift_implementations and not doc.is_new: + shift_releases = True + if shift_releases and not doc.is_new: # Shift checkpoint to invalidate solutions - self.volume['implementation'].checkpoint() + self.volume['release'].checkpoint() NodeRoutes.after_post(self, doc) def _push(self, stream): diff --git a/sugar_network/node/routes.py b/sugar_network/node/routes.py index ebb46a8..5f066a9 100644 --- a/sugar_network/node/routes.py +++ b/sugar_network/node/routes.py @@ -149,10 +149,10 @@ class NodeRoutes(model.VolumeRoutes, model.FrontRoutes): response.content_type = 'application/json' return result - @route('POST', ['implementation'], cmd='submit', + @route('POST', ['release'], cmd='submit', arguments={'initial': False}, mime_type='application/json', acl=ACL.AUTH) - def submit_implementation(self, request, document): + def submit_release(self, request, document): with toolkit.NamedTemporaryFile() as blob: shutil.copyfileobj(request.content_stream, blob) blob.flush() @@ -373,7 +373,7 @@ class NodeRoutes(model.VolumeRoutes, model.FrontRoutes): if 'stability' not in request: request['stability'] = 'stable' - impls, __ = self.volume['implementation'].find( + impls, __ = self.volume['release'].find( context=request.guid, order_by='-version', not_layer='deleted', **request) impl = None @@ -384,13 +384,13 @@ class NodeRoutes(model.VolumeRoutes, model.FrontRoutes): continue break else: - raise http.NotFound('No implementations found') + raise http.NotFound('No releases found') return impl def _get_clone(self, request, response): impl = self._solve(request) result = request.call(method=request.method, - path=['implementation', impl['guid'], 'data'], + path=['release', impl['guid'], 'data'], response=response) response.meta = impl.properties([ 'guid', 'ctime', 'layer', 'author', 'tags', @@ -437,12 +437,12 @@ def generate_node_stats(volume, path): for resource, props in [ ('user', []), ('context', []), - ('implementation', ['context']), + ('release', ['context']), ('artifact', ['context', 'type']), ('feedback', ['context']), ('solution', ['context', 'feedback']), ('review', ['context', 'artifact', 'rating']), - ('report', ['context', 'implementation']), + ('report', ['context', 'release']), ('comment', ['context', 'review', 'feedback', 'solution']), ]: objs, __ = volume[resource].find( @@ -454,7 +454,7 @@ def generate_node_stats(volume, path): for resource, props in [ ('user', ['layer']), ('context', ['layer']), - ('implementation', ['layer']), + ('release', ['layer']), ('artifact', ['layer']), ('feedback', ['layer', 'solution']), ('solution', ['layer']), @@ -498,7 +498,7 @@ def load_bundle(volume, request, bundle_path): contexts = volume['context'] context = impl.get('context') context_meta = None - impls = volume['implementation'] + impls = volume['release'] try: bundle = Bundle(bundle_path, mime_type='application/zip') @@ -574,8 +574,7 @@ def load_bundle(volume, request, bundle_path): context=context, version=impl['version'], not_layer='deleted') if 'url' not in data: data['blob'] = bundle_path - impl['guid'] = \ - request.call(method='POST', path=['implementation'], content=impl) + impl['guid'] = request.call(method='POST', path=['release'], content=impl) for i in existing: layer = i['layer'] + ['deleted'] impls.update(i.guid, {'layer': layer}) diff --git a/sugar_network/node/stats_node.py b/sugar_network/node/stats_node.py index 8a91994..cc77424 100644 --- a/sugar_network/node/stats_node.py +++ b/sugar_network/node/stats_node.py @@ -250,9 +250,9 @@ class _ContextStats(_ResourceStats): self['downloaded'] = 0 -class _ImplementationStats(_Stats): +class _ReleaseStats(_Stats): - RESOURCE = 'implementation' + RESOURCE = 'release' OWNERS = ['context'] def log(self, request): @@ -268,7 +268,7 @@ class _ImplementationStats(_Stats): class _ReportStats(_Stats): RESOURCE = 'report' - OWNERS = ['context', 'implementation'] + OWNERS = ['context', 'release'] def log(self, request): if request.method == 'POST': @@ -338,7 +338,7 @@ class _CommentStats(_ResourceStats): _STATS = {_UserStats.RESOURCE: _UserStats, _ContextStats.RESOURCE: _ContextStats, - _ImplementationStats.RESOURCE: _ImplementationStats, + _ReleaseStats.RESOURCE: _ReleaseStats, _ReportStats.RESOURCE: _ReportStats, _ReviewStats.RESOURCE: _ReviewStats, _FeedbackStats.RESOURCE: _FeedbackStats, diff --git a/sugar_network/node/volume.py b/sugar_network/node/volume.py index 00ff983..0c254f7 100644 --- a/sugar_network/node/volume.py +++ b/sugar_network/node/volume.py @@ -21,7 +21,7 @@ from sugar_network.toolkit import http, coroutine, enforce # Apply node level layer for these documents -_LIMITED_RESOURCES = ('context', 'implementation') +_LIMITED_RESOURCES = ('context', 'release') _logger = logging.getLogger('node.volume') |