Skip to content

Commit

Permalink
Add ovdc, template, and system request handlers
Browse files Browse the repository at this point in the history
- ovdc_request_handler.py became ovdc_handler.py
- Removed unnecessary classes (ServiceProcessor)
- Moved all generic OVDC code to ovdc_utils.py
- ovdc_handler.py is responsible for using the request dict and auth
  token to pass relevant data to the generic ovdc functions. It is
  also responsible for validating request dict keys relevant to
  the operation
  • Loading branch information
andrew-ni committed Jul 23, 2019
1 parent 0a1bf5a commit 00a630a
Show file tree
Hide file tree
Showing 11 changed files with 675 additions and 716 deletions.
11 changes: 4 additions & 7 deletions container_service_extension/broker_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
from container_service_extension.exceptions import ClusterAlreadyExistsError
from container_service_extension.exceptions import ClusterNotFoundError
from container_service_extension.exceptions import CseServerError
from container_service_extension.ovdc_manager import \
construct_ctr_prov_ctx_from_ovdc_metadata
import container_service_extension.ovdc_utils as ovdc_utils
from container_service_extension.pksbroker import PKSBroker
from container_service_extension.pksbroker_manager import PksBrokerManager
from container_service_extension.server_constants import CseOperation
Expand Down Expand Up @@ -151,8 +150,7 @@ def _create_cluster(self, **cluster_spec):
cluster, _ = self._find_cluster_in_org(cluster_name,
is_org_admin_search=True)
if not cluster:
ctr_prov_ctx = construct_ctr_prov_ctx_from_ovdc_metadata(
ovdc_name=vdc_name, org_name=org_name)
ctr_prov_ctx = ovdc_utils.get_ovdc_k8s_provider_metadata(org_name=org_name, ovdc_name=vdc_name, get_credentials=True, get_nsxt_info=True)
if ctr_prov_ctx.get(K8S_PROVIDER_KEY) == K8sProvider.PKS:
cluster_spec['pks_plan'] = ctr_prov_ctx[PKS_PLANS_KEY][0]
cluster_spec['pks_ext_host'] = \
Expand Down Expand Up @@ -258,7 +256,7 @@ def _get_broker_based_on_ctr_prov_ctx(self, ctr_prov_ctx):
"deployment")

def _get_broker_based_on_vdc(self):
"""Get the broker based on ovdc.
"""Get the broker based on org VDC.
:return: broker
Expand All @@ -267,7 +265,6 @@ def _get_broker_based_on_vdc(self):
ovdc_name = self.req_spec.get(RequestKey.OVDC_NAME)
org_name = self.req_spec.get(RequestKey.ORG_NAME)

ctr_prov_ctx = construct_ctr_prov_ctx_from_ovdc_metadata(
ovdc_name=ovdc_name, org_name=org_name)
ctr_prov_ctx = ovdc_utils.get_ovdc_k8s_provider_metadata(org_name=org_name, ovdc_name=ovdc_name, get_credentials=True, get_nsxt_info=True)

return self._get_broker_based_on_ctr_prov_ctx(ctr_prov_ctx)
5 changes: 2 additions & 3 deletions container_service_extension/consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import requests

from container_service_extension.logger import SERVER_LOGGER as LOGGER
from container_service_extension.processor import ServiceProcessor
import container_service_extension.processor as processor
from container_service_extension.server_constants import EXCHANGE_TYPE


Expand All @@ -39,7 +39,6 @@ def __init__(self,
self.exchange = exchange
self.routing_key = routing_key
self.queue = routing_key
self.service_processor = ServiceProcessor()
self.fsencoding = sys.getfilesystemencoding()

def connect(self):
Expand Down Expand Up @@ -153,7 +152,7 @@ def on_message(self, unused_channel, basic_deliver, properties, body):
f"from {properties.app_id} "
f"({threading.currentThread().ident}): "
f"{json.dumps(body_json)}, props: {properties}")
result = self.service_processor.process_request(body_json)
result = processor.process_request(body_json)
status_code = result['status_code']
reply_body = json.dumps(result['body'])
except Exception as e:
Expand Down
295 changes: 0 additions & 295 deletions container_service_extension/ovdc_manager.py

This file was deleted.

Loading

0 comments on commit 00a630a

Please sign in to comment.