summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
84867b7)
1. Fix the response that get subscription
2. Replace uow to bus while call configure_namespace
Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: I7656280b2df3840646cc8dbf7917fbd24402d30a
from flask_restx import Namespace
from flask_restx import Namespace
-api = Namespace("O2IMS Inventory v1",
- description='The Inventory version1 of '
- 'O2 Infrastructure Management Services')
+api = Namespace("O2IMS_Inventory",
+ description='IMS Inventory related operations.')
@api.marshal_with(ocloud_get)
def get(self):
@api.marshal_with(ocloud_get)
def get(self):
- res = ocloud_view.oclouds(uow)
+ res = ocloud_view.oclouds(bus.uow)
if len(res) > 0:
return res[0]
api.abort(
if len(res) > 0:
return res[0]
api.abort(
@api.marshal_list_with(model)
def get(self):
@api.marshal_list_with(model)
def get(self):
- return ocloud_view.resource_types(uow)
-
- # @api.doc(response={405: 'Method Not Allowed'})
- # def post(self):
- # api.abort(405)
-
- # @api.doc(response={405: 'Method Not Allowed'})
- # def put(self):
- # api.abort(405)
-
- # @api.doc(response={405: 'Method Not Allowed'})
- # def patch(self):
- # api.abort(405)
-
- # @api.doc(response={405: 'Method Not Allowed'})
- # def delete(self):
- # api.abort(405)
+ return ocloud_view.resource_types(bus.uow)
@api.route("/resourceTypes/<resourceTypeID>")
@api.route("/resourceTypes/<resourceTypeID>")
@api.doc('Get resource type')
@api.marshal_with(model)
def get(self, resourceTypeID):
@api.doc('Get resource type')
@api.marshal_with(model)
def get(self, resourceTypeID):
- result = ocloud_view.resource_type_one(resourceTypeID, uow)
+ result = ocloud_view.resource_type_one(resourceTypeID, bus.uow)
if result is not None:
return result
api.abort(
if result is not None:
return result
api.abort(
@api.marshal_list_with(model)
def get(self):
@api.marshal_list_with(model)
def get(self):
- return ocloud_view.resource_pools(uow)
+ return ocloud_view.resource_pools(bus.uow)
@api.route("/resourcePools/<resourcePoolID>")
@api.route("/resourcePools/<resourcePoolID>")
@api.doc('Get resource pool')
@api.marshal_with(model)
def get(self, resourcePoolID):
@api.doc('Get resource pool')
@api.marshal_with(model)
def get(self, resourcePoolID):
- result = ocloud_view.resource_pool_one(resourcePoolID, uow)
+ result = ocloud_view.resource_pool_one(resourcePoolID, bus.uow)
if result is not None:
return result
api.abort(
if result is not None:
return result
api.abort(
@api.marshal_list_with(model)
def get(self, resourcePoolID):
@api.marshal_list_with(model)
def get(self, resourcePoolID):
- return ocloud_view.resources(resourcePoolID, uow)
+ return ocloud_view.resources(resourcePoolID, bus.uow)
@api.route("/resourcePools/<resourcePoolID>/resources/<resourceID>")
@api.route("/resourcePools/<resourcePoolID>/resources/<resourceID>")
@api.doc('Get resource')
@api.marshal_with(model)
def get(self, resourcePoolID, resourceID):
@api.doc('Get resource')
@api.marshal_with(model)
def get(self, resourcePoolID, resourceID):
- result = ocloud_view.resource_one(resourceID, uow)
+ result = ocloud_view.resource_one(resourceID, bus.uow)
if result is not None:
return result
api.abort(404, "Resource {} doesn't exist".format(resourceID))
if result is not None:
return result
api.abort(404, "Resource {} doesn't exist".format(resourceID))
@api.marshal_list_with(model)
def get(self):
@api.marshal_list_with(model)
def get(self):
- return ocloud_view.deployment_managers(uow)
+ return ocloud_view.deployment_managers(bus.uow)
@api.route("/deploymentManagers/<deploymentManagerID>")
@api.route("/deploymentManagers/<deploymentManagerID>")
@api.marshal_with(model)
def get(self, deploymentManagerID):
result = ocloud_view.deployment_manager_one(
@api.marshal_with(model)
def get(self, deploymentManagerID):
result = ocloud_view.deployment_manager_one(
- deploymentManagerID, uow)
+ deploymentManagerID, bus.uow)
if result is not None:
return result
api.abort(404, "Deployment manager {} doesn't exist".format(
if result is not None:
return result
api.abort(404, "Deployment manager {} doesn't exist".format(
@api.doc('List subscriptions')
@api.marshal_list_with(model)
def get(self):
@api.doc('List subscriptions')
@api.marshal_list_with(model)
def get(self):
- return ocloud_view.subscriptions(uow)
+ return ocloud_view.subscriptions(bus.uow)
@api.doc('Create a subscription')
@api.expect(expect)
@api.doc('Create a subscription')
@api.expect(expect)
subscription = Subscription(
sub_uuid, data['callback'], data['consumerSubscriptionId'],
data['filter'])
subscription = Subscription(
sub_uuid, data['callback'], data['consumerSubscriptionId'],
data['filter'])
- ocloud_view.subscription_create(subscription, uow)
+ ocloud_view.subscription_create(subscription, bus.uow)
return {"subscriptionId": sub_uuid}, 201
return {"subscriptionId": sub_uuid}, 201
@api.response(404, 'Subscription not found')
class SubscriptionGetDelRouter(Resource):
@api.response(404, 'Subscription not found')
class SubscriptionGetDelRouter(Resource):
- model = DeploymentManagerDTO.deployment_manager_get
+ model = SubscriptionDTO.subscription_get
@api.doc('Get subscription by ID')
@api.marshal_with(model)
def get(self, subscriptionID):
result = ocloud_view.subscription_one(
@api.doc('Get subscription by ID')
@api.marshal_with(model)
def get(self, subscriptionID):
result = ocloud_view.subscription_one(
+ subscriptionID, bus.uow)
if result is not None:
return result
api.abort(404, "Subscription {} doesn't exist".format(
if result is not None:
return result
api.abort(404, "Subscription {} doesn't exist".format(
@api.doc('Delete subscription by ID')
@api.response(204, 'Subscription deleted')
def delete(self, subscriptionID):
@api.doc('Delete subscription by ID')
@api.response(204, 'Subscription deleted')
def delete(self, subscriptionID):
- with uow:
- uow.subscriptions.delete(subscriptionID)
- uow.commit()
+ with bus.uow:
+ bus.uow.subscriptions.delete(subscriptionID)
+ bus.uow.commit()
-def configure_namespace(app, bus):
+def configure_namespace(app, bus_new):
+
+ # Set global bus for resource
+ global bus
+ bus = bus_new
api_v1 = api
app.add_namespace(api_v1, path=apibase)
api_v1 = api
app.add_namespace(api_v1, path=apibase)
-
- # Set global uow
- global uow
- uow = bus.uow