From: Vikas Varma <vv8305@att.com>
Date: Tue, 9 Apr 2019 13:51:04 +0000 (+0000)
Subject: Merge "Automate the process of policy model uploading"
X-Git-Tag: 1.3.0~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=134a18e619772b6cb21000c97291d7966d5598eb;p=optf%2Fosdf.git

Merge "Automate the process of policy model uploading"
---

134a18e619772b6cb21000c97291d7966d5598eb
diff --cc osdfapp.py
index a83adb7,cebedc2..ed518b2
--- a/osdfapp.py
+++ b/osdfapp.py
@@@ -20,32 -20,38 +20,33 @@@
  OSDF Manager Main Flask Application
  """
  
 +import json
  import sys
 +import traceback
 +from optparse import OptionParser
  from threading import Thread  # for scaling up, may need celery with RabbitMQ or redis
  
 +import pydevd
  from flask import Flask, request, Response, g
 +from requests import RequestException
 +from schematics.exceptions import DataError
  
 -import osdf
 -import pydevd
 -import json
  import osdf.adapters.aaf.sms as sms
 -import osdf.adapters.policy.interface
 -import osdf.config.credentials
 -import osdf.config.loader
 -import osdf.operation.error_handling
  import osdf.operation.responses
 -import traceback
 -from schematics.exceptions import DataError
 -from requests import RequestException
 -from optparse import OptionParser
  from osdf.adapters.policy.interface import get_policies
+ from osdf.adapters.policy.interface import upload_policy_models
  from osdf.config.base import osdf_config
 -from osdf.optimizers.placementopt.conductor.remote_opt_processor import process_placement_opt
 -from osdf.webapp.appcontroller import auth_basic
 -from osdf.operation.exceptions import BusinessException
 -from osdf.operation.error_handling import request_exception_to_json_body, internal_error_message
  from osdf.logging.osdf_logging import MH, audit_log, error_log, debug_log
 -from osdf.models.api.placementRequest import PlacementAPI
  from osdf.models.api.pciOptimizationRequest import PCIOptimizationAPI
 +from osdf.models.api.placementRequest import PlacementAPI
 +from osdf.operation.error_handling import request_exception_to_json_body, internal_error_message
 +from osdf.operation.exceptions import BusinessException
  from osdf.operation.responses import osdf_response_for_request_accept as req_accept
 -from osdf.optimizers.routeopt.simple_route_opt import RouteOpt
  from osdf.optimizers.pciopt.pci_opt_processor import process_pci_optimation
 +from osdf.optimizers.placementopt.conductor.remote_opt_processor import process_placement_opt
 +from osdf.optimizers.routeopt.simple_route_opt import RouteOpt
  from osdf.utils import api_data_utils
 +from osdf.webapp.appcontroller import auth_basic
  
  ERROR_TEMPLATE = osdf.ERROR_TEMPLATE