diff options
Diffstat (limited to 'conductor')
7 files changed, 1 insertions, 118 deletions
diff --git a/conductor/conductor/api/adapters/aaf/aaf_authentication.py b/conductor/conductor/api/adapters/aaf/aaf_authentication.py index e088024..a85ac11 100644 --- a/conductor/conductor/api/adapters/aaf/aaf_authentication.py +++ b/conductor/conductor/api/adapters/aaf/aaf_authentication.py @@ -95,7 +95,6 @@ def authenticate(uid, passwd): return has_valid_permissions(perms) except Exception as exp: LOG.error("Error Authenticating the user {} : {}: ".format(uid, exp)) - pass return False """ diff --git a/conductor/conductor/api/controllers/v1/latency_country_rules_loader.py b/conductor/conductor/api/controllers/v1/latency_country_rules_loader.py index 37ee456..ca7aa9d 100644 --- a/conductor/conductor/api/controllers/v1/latency_country_rules_loader.py +++ b/conductor/conductor/api/controllers/v1/latency_country_rules_loader.py @@ -38,11 +38,6 @@ LOG = log.getLogger(__name__) class LatencyCountryRulesBaseController(object): def load(self, args): - - ctx = {} - #method = 'release_orders' - method = 'load' - client = pecan.request.controller latency_dataloader.LatencyDataLoader().load_into_country_letancy(args) response = "OK" diff --git a/conductor/conductor/api/controllers/v1/latency_loader.py b/conductor/conductor/api/controllers/v1/latency_loader.py index f5c5336..3268c04 100644 --- a/conductor/conductor/api/controllers/v1/latency_loader.py +++ b/conductor/conductor/api/controllers/v1/latency_loader.py @@ -41,9 +41,6 @@ class LatencyLoadController(object): @index.when(method='POST', template='json') def index_POST(self, **kwargs): - json_data = kwargs['data'] - test = latency_dataloader.LatencyDataLoader().load_into_rph(json_data) - return kwargs['data'] diff --git a/conductor/conductor/api/controllers/v1/latency_reduction_loader.py b/conductor/conductor/api/controllers/v1/latency_reduction_loader.py index ac7c16e..5222617 100644 --- a/conductor/conductor/api/controllers/v1/latency_reduction_loader.py +++ b/conductor/conductor/api/controllers/v1/latency_reduction_loader.py @@ -38,11 +38,6 @@ LOG = log.getLogger(__name__) class LatencyLoaderBaseController(object): def load(self, args): - - ctx = {} - #method = 'release_orders' - method = 'load_latency_rules' - client = pecan.request.controller latency_dataloader.LatencyDataLoader().load_into_rph(args) response = "OK" diff --git a/conductor/conductor/api/controllers/v1/triage.py b/conductor/conductor/api/controllers/v1/triage.py index 60511a1..08ed546 100644 --- a/conductor/conductor/api/controllers/v1/triage.py +++ b/conductor/conductor/api/controllers/v1/triage.py @@ -32,29 +32,6 @@ CONF = cfg.CONF LOG = log.getLogger(__name__) -# Triage_API_OPTS = [ -# cfg.StrOpt('server_url', -# default='', -# help='Base URL for tData.'), -# cfg.StrOpt('username', -# default='admin1', -# help='username for tData.'), -# cfg.StrOpt('password', -# default='plan.15', -# help='password for tData.'), -# cfg.BoolOpt('basic_auth_secure', -# default=True, -# help='auth toggling.') -# ] -# -# CONF.register_opts(Triage_API_OPTS, group='triage_api') -# -# CREATE_SCHEMA = ( -# (decorators.optional('id'), types.string), -# (decorators.optional('name'), types.string), -# ('children', string_or_dict), -# ) - class TriageBaseController(object): """Triage Base Controller - Common Methods""" @@ -84,7 +61,6 @@ class TriageBaseController(object): triage = result for tData in triage['triageData']: - thetData_id = tData.get('id') triage_data_list.append(tData) if id: diff --git a/conductor/conductor/api/hooks.py b/conductor/conductor/api/hooks.py index 08677cc..e866c8d 100644 --- a/conductor/conductor/api/hooks.py +++ b/conductor/conductor/api/hooks.py @@ -20,10 +20,7 @@ from oslo_log import log from pecan import hooks -# from conductor.common.models import plan -# from conductor.common.music import api from conductor.common.music import messaging as music_messaging -# from conductor.common.music.model import base from conductor import messaging LOG = log.getLogger(__name__) @@ -61,77 +58,4 @@ class MessagingHook(hooks.PecanHook): # NOTE: We no longer use ModelHook, since the API should be asking -# the controller (via RPC) for info about plans, not requesting them directly. - -# class ModelHook(hooks.PecanHook): -# """Create and attach dynamic model classes to the request.""" -# -# def __init__(self, conf): -# super(ModelHook, self).__init__() -# -# # TODO(jdandrea) Move this to DBHook? -# music = api.API() -# music.keyspace_create(keyspace=conf.keyspace) -# -# # Dynamically create a plan class for the specified keyspace -# self.Plan = base.create_dynamic_model( -# keyspace=conf.keyspace, baseclass=plan.Plan, classname="Plan") -# -# def before(self, state): -# state.request.models = { -# "Plan": self.Plan, -# } - - -# class DBHook(hooks.PecanHook): -# -# def __init__(self): -# self.storage_connection = DBHook.get_connection('metering') -# self.event_storage_connection = DBHook.get_connection('event') -# -# if (not self.storage_connection -# and not self.event_storage_connection): -# raise Exception("API failed to start. Failed to connect to " -# "databases, purpose: %s" % -# ', '.join(['metering', 'event'])) -# -# def before(self, state): -# state.request.storage_conn = self.storage_connection -# state.request.event_storage_conn = self.event_storage_connection -# -# @staticmethod -# def get_connection(purpose): -# try: -# return storage.get_connection_from_config(cfg.CONF, purpose) -# except Exception as err: -# params = {"purpose": purpose, "err": err} -# LOG.exception(_LE("Failed to connect to db, purpose %(purpose)s " -# "retry later: %(err)s") % params) -# -# -# class NotifierHook(hooks.PecanHook): -# """Create and attach a notifier to the request. -# Usually, samples will be push to notification bus by notifier when they -# are posted via /v2/meters/ API. -# """ -# -# def __init__(self): -# transport = messaging.get_transport() -# self.notifier = oslo_messaging.Notifier( -# transport, driver=cfg.CONF.publisher_notifier.homing_driver, -# publisher_id="conductor.api") -# -# def before(self, state): -# state.request.notifier = self.notifier -# -# -# class TranslationHook(hooks.PecanHook): -# -# def after(self, state): -# # After a request has been done, we need to see if -# # ClientSideError has added an error onto the response. -# # If it has we need to get it info the thread-safe WSGI -# # environ to be used by the ParsableErrorMiddleware. -# if hasattr(state.response, 'translatable_error'): -# state.request.environ['translatable_error'] = ( -# state.response.translatable_error) +# the controller (via RPC) for info about plans, not requesting them directly.
\ No newline at end of file diff --git a/conductor/conductor/common/models/region_placeholders.py b/conductor/conductor/common/models/region_placeholders.py index b3845a0..850ae42 100644 --- a/conductor/conductor/common/models/region_placeholders.py +++ b/conductor/conductor/common/models/region_placeholders.py @@ -91,9 +91,6 @@ class RegionPlaceholders(base.Base): self.region_name = region_name self.countries = countries - if _insert: - return self.insert() - def __repr__(self): """Object representation""" return '<RegionPlaceholders {}>'.format(self.id) |