diff options
| -rwxr-xr-x | conductor.conf | 302 | ||||
| -rw-r--r-- | conductor/conductor/api/app.py | 4 | ||||
| -rw-r--r-- | conductor/conductor/data/plugins/inventory_provider/aai.py | 4 | ||||
| -rw-r--r-- | conductor/conductor/data/plugins/service_controller/sdnc.py | 4 | ||||
| -rw-r--r-- | conductor/conductor/data/plugins/vim_controller/multicloud.py | 4 | ||||
| -rw-r--r-- | conductor/conductor/opts.py | 8 |
6 files changed, 250 insertions, 76 deletions
diff --git a/conductor.conf b/conductor.conf index bb43e55..d40b7b7 100755 --- a/conductor.conf +++ b/conductor.conf @@ -8,7 +8,14 @@ #api_paste_config = api_paste.ini # Music keyspace for content (string value) -keyspace = conductor +#keyspace = conductor + +# Delay time (Seconds) for MUSIC requests. Set it to 2 seconds by default. +# (integer value) +#delay_time = 2 + +# (boolean value) +#HPA_enabled = true # # From oslo.log @@ -17,13 +24,7 @@ keyspace = conductor # If set to true, the logging level will be set to DEBUG instead of the default # INFO level. (boolean value) # Note: This option can be changed without restarting. -debug = true - -# DEPRECATED: If set to false, the logging level will be set to WARNING instead -# of the default INFO level. (boolean value) -# This option is deprecated for removal. -# Its value may be silently ignored in the future. -#verbose = true +#debug = false # The name of a logging configuration file. This file is appended to any # existing logging configuration files. For details about logging configuration @@ -33,7 +34,7 @@ debug = true # example, logging_context_format_string). (string value) # Note: This option can be changed without restarting. # Deprecated group/name - [DEFAULT]/log_config -log_config_append = /usr/local/bin/log.conf +#log_config_append = <None> # Defines the format string for %%(asctime)s in log records. Default: # %(default)s . This option is ignored if log_config_append is set. (string @@ -63,10 +64,20 @@ log_config_append = /usr/local/bin/log.conf # is set. (boolean value) #use_syslog = false +# Enable journald for logging. If running in a systemd environment you may wish +# to enable journal support. Doing so will use the journal native protocol +# which includes structured metadata in addition to log messages.This option is +# ignored if log_config_append is set. (boolean value) +#use_journal = false + # Syslog facility to receive log lines. This option is ignored if # log_config_append is set. (string value) #syslog_log_facility = LOG_USER +# Use JSON formatting for logging. This option is ignored if log_config_append +# is set. (boolean value) +#use_json = false + # Log output to standard error. This option is ignored if log_config_append is # set. (boolean value) #use_stderr = false @@ -91,7 +102,7 @@ log_config_append = /usr/local/bin/log.conf # List of package logging levels in logger=LEVEL pairs. This option is ignored # if log_config_append is set. (list value) -#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO +#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,oslo_messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO # Enables or disables publication of error events. (boolean value) #publish_errors = false @@ -119,6 +130,7 @@ log_config_append = /usr/local/bin/log.conf # Enables or disables fatal status of deprecations. (boolean value) #fatal_deprecations = false + [aaf_authentication] # @@ -126,7 +138,7 @@ log_config_append = /usr/local/bin/log.conf # # is_aaf_enabled. (boolean value) -is_aaf_enabled = false +#is_aaf_enabled = true # aaf_cache_expiry_hrs. (integer value) #aaf_cache_expiry_hrs = 3 @@ -173,7 +185,12 @@ aaf_url = http://aaf-service:8100/authz/perms/user/ # # Interval with which to refresh the local cache, in minutes. (integer value) +#cache_refresh_interval = 1440 cache_refresh_interval = 1 + +# Interval with which to refresh the local complex cache, in minutes. (integer +# value) +#complex_cache_refresh_interval = 1440 complex_cache_refresh_interval = 60 # Data Store table prefix. (string value) @@ -181,27 +198,36 @@ complex_cache_refresh_interval = 60 # Base URL for A&AI, up to and not including the version, and without a # trailing slash. (string value) +#server_url = https://controller:8443/aai server_url = https://aai.api.simpledemo.onap.org:8443/aai +# Timeout for A&AI Rest Call (string value) +#aai_rest_timeout = 30 + +# Number of retry for A&AI Rest Call (string value) +#aai_retries = 3 + # The version of A&AI in v# format. (string value) server_url_version = v14 # SSL/TLS certificate file in pem format. This certificate must be registered # with the A&AI endpoint. (string value) +#certificate_file = certificate.pem certificate_file = # Private Certificate Key file in pem format. (string value) +#certificate_key_file = certificate_key.pem certificate_key_file = # Certificate Authority Bundle file in pem format. Must contain the appropriate # trust chain for the Certificate file. (string value) -#certificate_authority_bundle_file = /opt/app/conductor/etc/certs/ca_bundle.pem +#certificate_authority_bundle_file = certificate_authority_bundle.pem certificate_authority_bundle_file = /usr/local/bin/AAF_RootCA.cer -# Basic Authentication Username (string value) +# Username for AAI. (string value) username = OOF -# Basic Authentication Password (string value) +# Password for AAI. (string value) password = OOF @@ -218,15 +244,27 @@ password = OOF # Minimum value: 1 #default_api_return_limit = 100 + [conductor_api] -# Basic Authentication Username (string value) +# +# From conductor +# + +# Base URL for plans. (string value) +#server_url = + +# username for plans. (string value) +#username = username = admin1 -# Basic Authentication Password (string value) +# password for plans. (string value) +#password = password = plan.15 -basic_auth_secure = True +# auth toggling. (boolean value) +#basic_auth_secure = true + [controller] @@ -236,7 +274,7 @@ basic_auth_secure = True # Timeout for planning requests. Default value is 10. (integer value) # Minimum value: 1 -timeout = 200 +#timeout = 10 # Maximum number of result sets to return. Default value is 1. (integer value) # Minimum value: 1 @@ -246,11 +284,47 @@ timeout = 200 # Minimum value: 1 #workers = 1 +# Set to True when controller will run in active-active mode. When set to +# False, controller will flush any abandoned messages at startup. The +# controller always restarts abandoned template translations at startup. +# (boolean value) +#concurrent = false +concurrent = true + # Time between checking for new plans. Default value is 1. (integer value) # Minimum value: 1 #polling_interval = 1 + +# (integer value) +# Minimum value: 1 +#max_translation_counter = 1 + + +[data] + +# +# From conductor +# + +# Number of workers for data service. Default value is 1. (integer value) +# Minimum value: 1 +#workers = 1 + +# Set to True when data will run in active-active mode. When set to False, data +# will flush any abandoned messages at startup. (boolean value) +#concurrent = false concurrent = true +# Default value is -8000, which is the diameter of the earth. The distance +# cannot larger than this value (floating point value) +#existing_placement_cost = -8000.0 + +# (floating point value) +#cloud_candidate_cost = 2.0 + +# (floating point value) +#service_candidate_cost = 1.0 + [inventory_provider] @@ -269,17 +343,22 @@ concurrent = true # # Music keyspace for messages (string value) -keyspace = conductor_rpc +#keyspace = conductor_rpc # Wait interval while checking for a message response. Default value is 1 # second. (integer value) # Minimum value: 1 #check_interval = 1 -# Overall message response timeout. Default value is 10 seconds. (integer +# Overall message response timeout. Default value is 120 seconds. (integer # value) # Minimum value: 1 -timeout = 300 +#response_timeout = 120 + +# Timeout for detecting a VM is down, and other VMs can pick the plan up. +# Default value is 5 minutes. (integer value) (integer value) +# Minimum value: 1 +#timeout = 300 # Number of workers for messaging service. Default value is 1. (integer value) # Minimum value: 1 @@ -293,19 +372,34 @@ timeout = 300 #debug = false +[multicloud] + +# +# From conductor +# + +# Base URL for Multicloud without a trailing slash. (string value) +#server_url = http://msb.onap.org/api/multicloud + +# Timeout for Multicloud Rest Call (string value) +#multicloud_rest_timeout = 30 + +# Number of retry for Multicloud Rest Call (string value) +#multicloud_retries = 3 + +# The version of Multicloud API. (string value) +#server_url_version = v0 + + [music_api] # # From conductor # -music_new_version = True + # Base URL for Music REST API without a trailing slash. (string value) server_url = http://localhost:8080/MUSIC/rest/v2 version = v2 -music_version = "2.5.3" -aafuser = conductor -aafpass = c0nduct0r -aafns = conductor # DEPRECATED: List of hostnames (round-robin access) (list value) # This option is deprecated for removal. @@ -325,21 +419,104 @@ aafns = conductor # Reason: Use server_url instead #path = <None> +# Socket connection timeout (floating point value) +#connect_timeout = 3.05 + +# Socket read timeout (floating point value) +#read_timeout = 12.05 + # Lock timeout (integer value) #lock_timeout = 10 + +# Replication factor (integer value) +#replication_factor = 1 replication_factor = 3 -# Log debug messages. Default value is False. (boolean value) -#debug = false # Use mock API (boolean value) #mock = false -# Socket connection timeout (floating point value) -connect_timeout = 3.05 +# (string value) +#music_topology = SimpleStrategy -# Socket read timeout (floating point value) -read_timeout = 12.05 +# Name of the first data center (string value) +#first_datacenter_name = <None> + +# Number of replicas in first data center (integer value) +#first_datacenter_replicas = <None> +# Name of the second data center (string value) +#second_datacenter_name = <None> + +# Number of replicas in second data center (integer value) +#second_datacenter_replicas = <None> + +# Name of the third data center (string value) +#third_datacenter_name = <None> + +# Number of replicas in third data center (integer value) +#third_datacenter_replicas = <None> + +# new or old version (boolean value) +#music_new_version = <None> +music_new_version = True + +# for version (string value) +#music_version = <None> +music_version = "2.5.3" + +# username value that used for creating basic authorization header (string +# value) +#aafuser = <None> +aafuser = conductor + +# password value that used for creating basic authorization header (string +# value) +#aafpass = <None> +aafpass = c0nduct0r + +# AAF namespace field used in MUSIC request header (string value) +#aafns = <None> +aafns = conductor + + +[prometheus] + +# +# From conductor +# + +# Prometheus Metrics Endpoint (list value) +#metrics_port = 8000,8001,8002,8003,8004 + + +[reservation] + +# +# From conductor +# + +# Number of workers for reservation service. Default value is 1. (integer +# value) +# Minimum value: 1 +#workers = 1 + +# Number of times reservation/release should be attempted. (integer value) +#reserve_retries = 1 + +# Timeout for detecting a VM is down, and other VMs can pick the plan up and +# resereve. Default value is 600 seconds. (integer value) (integer value) +# Minimum value: 1 +#timeout = 600 + +# Set to True when reservation will run in active-active mode. When set to +# False, reservation will restart any orphaned reserving requests at startup. +# (boolean value) +#concurrent = false +concurrent = true + +# (integer value) +# Minimum value: 1 +#max_reservation_counter = 1 [sdnc] @@ -355,13 +532,22 @@ read_timeout = 12.05 #table_prefix = sdnc # Base URL for SDN-C, up to and including the version. (string value) -server_url = https://sdncodl-conexus-e2e.ecomp.cci.att.com:8543/restconf/ +#server_url = https://controller:8443/restconf/ +server_url = https://sdnc.onap:8282/restconf/ # Basic Authentication Username (string value) +#username = <None> username = admin # Basic Authentication Password (string value) -password = sdnc.15 +#password = <None> +password = Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + +# Timeout for SDNC Rest Call (string value) +#sdnc_rest_timeout = 30 + +# Retry Numbers for SDNC Rest Call (string value) +#sdnc_retries = 3 [service_controller] @@ -384,50 +570,32 @@ password = sdnc.15 # Minimum value: 1 #workers = 1 +# The timeout value for solver service. Default value is 480 seconds. (integer +# value) +# Minimum value: 1 +#solver_timeout = 480 + # Set to True when solver will run in active-active mode. When set to False, # solver will restart any orphaned solving requests at startup. (boolean value) #concurrent = false concurrent = true +# Timeout for detecting a VM is down, and other VMs can pick the plan up. This +# value should be larger than solver_timeoutDefault value is 10 minutes. +# (integer value) (integer value) +# Minimum value: 1 +#timeout = 600 - -[reservation] -concurrent = true - - -[multicloud] - -# -# From conductor -# - -# Base URL for Multicloud without a trailing slash. (string value) -server_url = http://msb.onap.org:80/api/multicloud - -# Timeout for Multicloud Rest Call (string value) -multicloud_rest_timeout = 30 - -# Number of retry for Multicloud Rest Call (string value) -multicloud_retries = 3 - -# The version of Multicloud API. (string value) -server_url_version = v0 +# (integer value) +# Minimum value: 1 +#max_solver_counter = 1 [vim_controller] -# -# From conductor -# - -# Extensions list to use (list value) -extensions = multicloud - - -[prometheus] # # From conductor # -# Prometheus Metrics Endpoint (list value) -#metrics_port = 8000,8001,8002,8003,8004
\ No newline at end of file +# Extensions list to use (list value) +#extensions = multicloud diff --git a/conductor/conductor/api/app.py b/conductor/conductor/api/app.py index 70d54b5..e8f3d63 100644 --- a/conductor/conductor/api/app.py +++ b/conductor/conductor/api/app.py @@ -33,7 +33,7 @@ LOG = log.getLogger(__name__) CONF = cfg.CONF -OPTS = [ +WSGI_OPTS = [ cfg.StrOpt('api_paste_config', default="api_paste.ini", help="Configuration file for WSGI definition of API." @@ -51,7 +51,7 @@ API_OPTS = [ ), ] -CONF.register_opts(OPTS) +CONF.register_opts(WSGI_OPTS) CONF.register_opts(API_OPTS, group='api') # Pull in service opts. We use them here. diff --git a/conductor/conductor/data/plugins/inventory_provider/aai.py b/conductor/conductor/data/plugins/inventory_provider/aai.py index fdf914a..f37a40a 100644 --- a/conductor/conductor/data/plugins/inventory_provider/aai.py +++ b/conductor/conductor/data/plugins/inventory_provider/aai.py @@ -55,10 +55,10 @@ AAI_OPTS = [ help='Base URL for A&AI, up to and not including ' 'the version, and without a trailing slash.'), cfg.StrOpt('aai_rest_timeout', - default=30, + default='30', help='Timeout for A&AI Rest Call'), cfg.StrOpt('aai_retries', - default=3, + default='3', help='Number of retry for A&AI Rest Call'), cfg.StrOpt('server_url_version', default='v10', diff --git a/conductor/conductor/data/plugins/service_controller/sdnc.py b/conductor/conductor/data/plugins/service_controller/sdnc.py index 3242384..5518a93 100644 --- a/conductor/conductor/data/plugins/service_controller/sdnc.py +++ b/conductor/conductor/data/plugins/service_controller/sdnc.py @@ -46,10 +46,10 @@ SDNC_OPTS = [ cfg.StrOpt('password', help='Basic Authentication Password'), cfg.StrOpt('sdnc_rest_timeout', - default=30, + default='30', help='Timeout for SDNC Rest Call'), cfg.StrOpt('sdnc_retries', - default=3, + default='3', help='Retry Numbers for SDNC Rest Call'), ] diff --git a/conductor/conductor/data/plugins/vim_controller/multicloud.py b/conductor/conductor/data/plugins/vim_controller/multicloud.py index 8eec9fa..3d904b4 100644 --- a/conductor/conductor/data/plugins/vim_controller/multicloud.py +++ b/conductor/conductor/data/plugins/vim_controller/multicloud.py @@ -37,10 +37,10 @@ MULTICLOUD_OPTS = [ default='http://msb.onap.org/api/multicloud', help='Base URL for Multicloud without a trailing slash.'), cfg.StrOpt('multicloud_rest_timeout', - default=30, + default='30', help='Timeout for Multicloud Rest Call'), cfg.StrOpt('multicloud_retries', - default=3, + default='3', help='Number of retry for Multicloud Rest Call'), cfg.StrOpt('server_url_version', default='v0', diff --git a/conductor/conductor/opts.py b/conductor/conductor/opts.py index d34fbcc..106de2d 100644 --- a/conductor/conductor/opts.py +++ b/conductor/conductor/opts.py @@ -19,7 +19,9 @@ import itertools +import conductor.api.adapters.aaf.aaf_authentication import conductor.api.app +import conductor.api.controllers.v1.plans import conductor.common.music.api import conductor.common.music.messaging.component import conductor.common.prometheus_metrics @@ -40,9 +42,11 @@ import conductor.solver.service def list_opts(): return [ ('DEFAULT', itertools.chain( - conductor.api.app.OPTS, + conductor.api.app.WSGI_OPTS, conductor.service.OPTS)), ('api', conductor.api.app.API_OPTS), + ('conductor_api', + conductor.api.controllers.v1.plans.CONDUCTOR_API_OPTS), ('controller', itertools.chain( conductor.controller.service.CONTROLLER_OPTS, conductor.controller.translator_svc.CONTROLLER_OPTS)), @@ -71,5 +75,7 @@ def list_opts(): ('solver', conductor.solver.service.SOLVER_OPTS), ('reservation', conductor.reservation.service.reservation_OPTS), ('aaf_sms', conductor.common.sms.AAF_SMS_OPTS), + ('aaf_authentication', + conductor.api.adapters.aaf.aaf_authentication.AAF_OPTS), ('prometheus', conductor.common.prometheus_metrics.METRICS_OPTS), ] |