Merge "Remove redundant optf CSIT tests"

23 files changed, 0 insertions, 1920 deletions

diff --git a/scripts/optf-has/has/has-properties/AAF_RootCA.cer b/scripts/optf-has/has/has-properties/AAF_RootCA.cer
deleted file mode 100644
index e9a50d7e..00000000
--- a/scripts/optf-has/has/has-properties/AAF_RootCA.cer
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV
-BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx
-NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK
-DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7
-XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn
-H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM
-pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7
-NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg
-2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY
-wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd
-ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM
-P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6
-aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY
-PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G
-A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ
-UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN
-BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz
-L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9
-7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx
-c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf
-jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2
-RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h
-PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF
-CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+
-Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A
-cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR
-ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX
-dYY=
------END CERTIFICATE-----
diff --git a/scripts/optf-has/has/has-properties/conductor.conf.onap b/scripts/optf-has/has/has-properties/conductor.conf.onap
deleted file mode 100644
index b8b0a0ad..00000000
--- a/scripts/optf-has/has/has-properties/conductor.conf.onap
+++ /dev/null
@@ -1,635 +0,0 @@
-[DEFAULT]
-
-#
-# From conductor
-#
-
-# Configuration file for WSGI definition of API. (string value)
-api_paste_config = /usr/local/etc/conductor/api_paste.ini
-
-# Music keyspace for content (string value)
-#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
-#
-
-# 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
-
-# The name of a logging configuration file. This file is appended to any
-# existing logging configuration files. For details about logging configuration
-# files, see the Python logging module documentation. Note that when logging
-# configuration files are used then all logging configuration is set in the
-# configuration file and other logging configuration options are ignored (for
-# 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
-
-# Defines the format string for %%(asctime)s in log records. Default:
-# %(default)s . This option is ignored if log_config_append is set. (string
-# value)
-#log_date_format = %Y-%m-%d %H:%M:%S
-
-# (Optional) Name of log file to send logging output to. If no default is set,
-# logging will go to stderr as defined by use_stderr. This option is ignored if
-# log_config_append is set. (string value)
-# Deprecated group/name - [DEFAULT]/logfile
-#log_file = application.log
-
-# (Optional) The base directory used for relative log_file  paths. This option
-# is ignored if log_config_append is set. (string value)
-# Deprecated group/name - [DEFAULT]/logdir
-log_dir = /var/log
-
-# Uses logging handler designed to watch file system. When log file is moved or
-# removed this handler will open a new log file with specified path
-# instantaneously. It makes sense only if log_file option is specified and
-# Linux platform is used. This option is ignored if log_config_append is set.
-# (boolean value)
-#watch_log_file = false
-
-# Use syslog for logging. Existing syslog format is DEPRECATED and will be
-# changed later to honor RFC5424. This option is ignored if log_config_append
-# 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
-
-# Format string to use for log messages with context. (string value)
-#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
-
-# Format string to use for log messages when context is undefined. (string
-# value)
-#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
-
-# Additional data to append to log message when logging level for the message
-# is DEBUG. (string value)
-#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d
-
-# Prefix each line of exception output with this format. (string value)
-#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s
-
-# Defines the format string for %(user_identity)s that is used in
-# logging_context_format_string. (string value)
-#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s
-
-# 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,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
-
-# The format for an instance that is passed with the log message. (string
-# value)
-#instance_format = "[instance: %(uuid)s] "
-
-# The format for an instance UUID that is passed with the log message. (string
-# value)
-#instance_uuid_format = "[instance: %(uuid)s] "
-
-# Interval, number of seconds, of log rate limiting. (integer value)
-#rate_limit_interval = 0
-
-# Maximum number of logged messages per rate_limit_interval. (integer value)
-#rate_limit_burst = 0
-
-# Log level name used by rate limiting: CRITICAL, ERROR, INFO, WARNING, DEBUG
-# or empty string. Logs with level greater or equal to rate_limit_except_level
-# are not filtered. An empty string means that all levels are filtered. (string
-# value)
-#rate_limit_except_level = CRITICAL
-
-# Enables or disables fatal status of deprecations. (boolean value)
-#fatal_deprecations = false
-
-
-[auth]
-# appkey = h@ss3crtky400fdntc#001
-appkey =
-
-[aaf_api]
-
-#
-# From conductor
-#
-
-# is_aaf_enabled. (boolean value)
-#is_aaf_enabled = true
-
-# aaf_cache_expiry_hrs. (integer value)
-#aaf_cache_expiry_hrs = 3
-
-# aaf_url. (string value)
-aaf_url = http://localhost:8100/authz/perms/user/
-
-# aaf_cert_file. (string value)
-#aaf_cert_file = <None>
-
-# aaf_cert_key_file. (string value)
-#aaf_cert_key_file = <None>
-
-# aaf_ca_bundle_file. (string value)
-#aaf_ca_bundle_file =
-aaf_ca_bundle_file = /usr/local/bin/AAF_RootCA.cer
-
-# aaf_retries. (integer value)
-#aaf_retries = 3
-
-# aaf_timeout. (integer value)
-#aaf_timeout = 100
-
-# aaf_user_roles. (list value)
-#aaf_permissions = {"type": "org.onap.oof.access","instance": "*","action": "*"}
-
-
-[aaf_sms]
-
-#
-# From conductor
-#
-
-# Is Secret Management service enabled (boolean value)
-#is_enabled = true
-
-# Base URL for SMS, up to and not including the version, and without a trailing
-# slash. (string value)
-aaf_sms_url = http://aaf-sms.onap:10443
-
-# Timeout for SMS API Call (integer value)
-#aaf_sms_timeout = 30
-
-# Path to the cacert that will be used to verify If this is None, verify will
-# be False and the server certis not verified by the client. (string value)
-#aaf_ca_certs = AAF_RootCA.cer
-aaf_ca_certs = /usr/local/bin/AAF_RootCA.cer
-
-# Domain Name for HAS (string value)
-#secret_domain = has
-
-
-[aai]
-
-#
-# From conductor
-#
-
-# 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)
-#table_prefix = aai
-
-# 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 = http://localhost:8081/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 = certificate_authority_bundle.pem
-certificate_authority_bundle_file = /usr/local/bin/AAF_RootCA.cer
-
-[api]
-
-#
-# From conductor
-#
-
-# Toggle Pecan Debug Middleware. (boolean value)
-#pecan_debug = false
-
-# Default maximum number of items returned by API request. (integer value)
-# Minimum value: 1
-#default_api_return_limit = 100
-
-
-[conductor_api]
-
-#
-# From conductor
-#
-
-# Base URL for plans. (string value)
-#server_url =
-
-# auth toggling. (boolean value)
-basic_auth_secure = false
-
-
-[controller]
-
-#
-# From conductor
-#
-
-# Timeout for planning requests. Default value is 10. (integer value)
-# Minimum value: 1
-#timeout = 10
-
-# Maximum number of result sets to return. Default value is 1. (integer value)
-# Minimum value: 1
-#limit = 1
-
-# Number of workers for controller service. Default value is 1. (integer value)
-# 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
-opt_schema_file = /opt/has/conductor/etc/conductor/opt_schema.json
-
-# (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]
-
-#
-# From conductor
-#
-
-# Extensions list to use (list value)
-extensions = aai,generator
-
-
-[messaging_server]
-
-#
-# From conductor
-#
-
-# Music keyspace for messages (string value)
-#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 120 seconds. (integer
-# value)
-# Minimum value: 1
-#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
-#workers = 1
-
-# Time between checking for new messages. Default value is 1. (integer value)
-# Minimum value: 1
-#polling_interval = 1
-
-# Log debug messages. Default value is False. (boolean value)
-#debug = false
-
-
-[multicloud]
-
-#
-# From conductor
-#
-
-# Base URL for Multicloud without a trailing slash. (string value)
-server_url = http://msb.onap.org:8082/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
-
-# Certificate Authority Bundle file in pem format. Must contain the appropriate
-# trust chain for the Certificate file. (string value)
-#certificate_authority_bundle_file = certificate_authority_bundle.pem
-certificate_authority_bundle_file = /usr/local/bin/AAF_RootCA.cer
-
-# Enabling HTTPs mode (boolean value)
-# enable_https_mode = <None>
-enable_https_mode = True
-[music_api]
-
-#
-# From conductor
-#
-
-# Base URL for Music REST API without a trailing slash. (string value)
-server_url = http://localhost:8080/MUSIC/rest/v2
-version = v2
-
-# DEPRECATED: List of hostnames (round-robin access) (list value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Use server_url instead
-#hostnames = <None>
-
-# DEPRECATED: Port (integer value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Use server_url instead
-#port = <None>
-
-# DEPRECATED: Path (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# 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
-
-# Use mock API (boolean value)
-#mock = false
-
-# (string value)
-#music_topology = SimpleStrategy
-
-# 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 = "3.0.21"
-
-[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]
-
-#
-# From conductor
-#
-
-# Interval with which to refresh the local cache, in minutes. (integer value)
-#cache_refresh_interval = 1440
-
-# Data Store table prefix. (string value)
-#table_prefix = sdnc
-
-# Base URL for SDN-C, up to and including the version. (string value)
-#server_url = https://controller:8443/restconf/
-server_url = http://localhost:8083/restconf/
-
-# Timeout for SDNC Rest Call (string value)
-#sdnc_rest_timeout = 30
-
-# Retry Numbers for SDNC Rest Call (string value)
-#sdnc_retries = 3
-
-
-[service_controller]
-
-#
-# From conductor
-#
-
-# Extensions list to use (list value)
-#extensions = sdnc
-
-
-[solver]
-
-#
-# From conductor
-#
-
-# Number of workers for solver service. Default value is 1. (integer value)
-# 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
-
-# (integer value)
-# Minimum value: 1
-#max_solver_counter = 1
-
-
-[vim_controller]
-
-#
-# From conductor
-#
-
-# Extensions list to use (list value)
-#extensions = multicloud
-
-
-[sdc]
-
-#
-# From conductor
-#
-
-
-# Data Store table prefix. (string value)
-#table_prefix = sdc
-
-# Base URL for SDC, up to and not including the version, and without a
-# trailing slash. (string value)
-#server_url = https://controller:8443/sdc
-server_url = http://localhost:9595/sdc
-
-# Timeout for SDC Rest Call (string value)
-#sdc_rest_timeout = 30
-
-# Number of retry for SDC Rest Call (string value)
-#sdc_retries = 3
-
-# The version of A&AI in v# format. (string value)
-server_url_version = v1
-
-# SSL/TLS certificate file in pem format. This certificate must be registered
-# with the SDC 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 = certificate_authority_bundle.pem
-certificate_authority_bundle_file = /usr/local/bin/AAF_RootCA.cer
-
-# Username for SDC. (string value)
-#username =
-
-# Password for SDC. (string value)
-#password =
-
-temp_path = "/tmp/nsttemplates"
-
diff --git a/scripts/optf-has/has/has-properties/has.json b/scripts/optf-has/has/has-properties/has.json
deleted file mode 100644
index 4f487712..00000000
--- a/scripts/optf-has/has/has-properties/has.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "domain": {
-        "name": "has",
-        "secrets": [
-            {
-                "name": "aai",
-                "values": {
-                    "username": "oof@oof.onap.org",
-                    "password": "demo123456!"
-                }
-            },
-            {
-                "name": "conductor_api",
-                "values": {
-                    "username": "admin1",
-                    "password": "plan.15"
-                }
-            },
-            {
-                "name": "sdnc",
-                "values": {
-                    "username": "admin",
-                    "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
-                }
-            },
-            {
-                "name": "music_api",
-                "values": {
-                    "aafuser": "conductor",
-                    "aafpass": "c0nduct0r",
-                    "aafns": "conductor"
-                }
-            },
-            {
-                "name": "aaf_api",
-                "values": {
-                    "username": "aaf_admin@people.osaaf.org",
-                    "password": "demo123456!",
-                    "aaf_conductor_user": "oof@oof.onap.org"
-                }
-            }
-        ]
-    }
-}
diff --git a/scripts/optf-has/has/has-properties/log.conf.onap b/scripts/optf-has/has/has-properties/log.conf.onap
deleted file mode 100644
index 41d66444..00000000
--- a/scripts/optf-has/has/has-properties/log.conf.onap
+++ /dev/null
@@ -1,65 +0,0 @@
-[loggers]
-keys=root
-
-[handlers]
-keys=trfhand,consoleHandler,audithand,metrichand,errhand,debughand
-
-[logger_root]
-level=NOTSET
-handlers=trfhand,consoleHandler,audithand,metrichand,errhand,debughand
-
-[handler_consoleHandler]
-class=StreamHandler
-level=NOTSET
-formatter=generic
-args=(sys.stdout,)
-
-[handler_trfhand]
-class=handlers.TimedRotatingFileHandler
-level=NOTSET
-formatter=generic
-args=('application.log','midnight', 1, 10)
-
-[handler_audithand]
-class=handlers.TimedRotatingFileHandler
-level=INFO
-formatter=audit
-args=('audit.log', 'midnight', 1, 10)
-
-[handler_metrichand]
-class=handlers.TimedRotatingFileHandler
-level=INFO
-formatter=metric
-args=('metric.log','midnight', 1, 10)
-
-[handler_errhand]
-class=handlers.TimedRotatingFileHandler
-level=ERROR
-formatter=error
-args=('error.log','midnight', 1, 10)
-
-[handler_debughand]
-class=handlers.TimedRotatingFileHandler
-level=DEBUG
-formatter=generic
-args=('debug.log','midnight', 1, 10)
-
-[formatters]
-keys=generic,audit,metric,error
-
-[formatter_audit]
-format=%(asctime)s|%(asctime)s|00000000-0000-0000-0000-000000000000||%(thread)d||Conductor|N/A|COMPLETE|200|sucessful||%(levelname)s|||0|%(module)s|||||||||%(name)s : [-] %(message)s
-datefmt=
-
-[formatter_metric]
-format=%(asctime)s|%(asctime)s|00000000-0000-0000-0000-000000000000||%(thread)d||Conductor|N/A|N/A|N/A|COMPLETE|200|sucessful||%(levelname)s|||0|%(module)s||||||||||%(name)s : [-] %(message)s
-datefmt=
-
-[formatter_error]
-format=%(asctime)s|00000000-0000-0000-0000-000000000000|%(thread)d|Conductor|N/A|N/A|N/A|ERROR|500|N/A|%(name)s : [-] %(message)s
-datefmt=
-
-[formatter_generic]
-format=%(asctime)s||%(thread)d|%(levelname)s|%(module)s|%(name)s: [-] %(message)s
-datefmt=
-
diff --git a/scripts/optf-has/has/has_proxy_settings.sh b/scripts/optf-has/has/has_proxy_settings.sh
deleted file mode 100755
index 48096103..00000000
--- a/scripts/optf-has/has/has_proxy_settings.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# put into this file local proxy settings in case they are needed on your local environment
-echo "### This is ${WORKSPACE}/scripts/optf-has/has/has_proxy_settings.sh"
-
-echo "optf/has proxy settings"
-if [ "$#" -eq  "1" ]; then
-     echo "$1"
-     cd $1
-     pwd
-else
-     exit 1
-fi
-
-# don't remove following lines: commands can be attached here
-
-
diff --git a/scripts/optf-has/has/has_script.sh b/scripts/optf-has/has/has_script.sh
deleted file mode 100755
index b845dda5..00000000
--- a/scripts/optf-has/has/has_script.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "### This is ${WORKSPACE}/scripts/optf-has/has/has_script.sh"
-#
-# add here whatever commands is needed to prepare the optf/has CSIT testing
-#
-
-# assume the base is /tmp dir
-DIR=/tmp
-
-# the directory of the script
-echo ${DIR}
-cd ${DIR}
-
-# create directory for volume and copy configuration file
-# run docker containers
-COND_CONF=/tmp/conductor/properties/conductor.conf
-LOG_CONF=/tmp/conductor/properties/log.conf
-IMAGE_NAME=nexus3.onap.org:10001/onap/optf-has
-IMAGE_VER=2.1.3-SNAPSHOT-latest
-BUNDLE=/tmp/conductor/properties/AAF_RootCA.cer
-
-mkdir -p /tmp/conductor/properties
-mkdir -p /tmp/sms/properties
-mkdir -p /tmp/conductor/logs
-cp ${WORKSPACE}/scripts/optf-has/has/has-properties/conductor.conf.onap /tmp/conductor/properties/conductor.conf
-cp ${WORKSPACE}/scripts/optf-has/has/has-properties/log.conf.onap /tmp/conductor/properties/log.conf
-cp ${WORKSPACE}/scripts/optf-has/has/has-properties/AAF_RootCA.cer /tmp/conductor/properties/AAF_RootCA.cer
-cp ${WORKSPACE}/scripts/optf-has/has/has-properties/has.json /tmp/sms/properties/has.json
-#chmod -R 777 /tmp/conductor/properties
-
-MUSIC_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
-echo "MUSIC_IP=${MUSIC_IP}"
-SMS_IP=`get-instance-ip.sh sms`
-echo "SMS_IP=${SMS_IP}"
-
-# change MUSIC reference to the local instance
-sed  -i -e "s%localhost:8080/MUSIC%${MUSIC_IP}:8080/MUSIC%g" /tmp/conductor/properties/conductor.conf
-
-AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim`
-echo "AAISIM_IP=${AAISIM_IP}"
-
-# change AAI reference to the local instance
-sed  -i -e "s%localhost:8081/%${AAISIM_IP}:8081/%g" /tmp/conductor/properties/conductor.conf
-
-SDCSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' sdcsim`
-echo "SDCSIM_IP=${SDCSIM_IP}"
-
-# change SDC reference to the local instance
-sed  -i -e "s%localhost:9595/%${SDCSIM_IP}:9595/%g" /tmp/conductor/properties/conductor.conf
-
-
-MULTICLOUDSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' multicloudsim`
-echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
-
-# change MULTICLOUD reference to the local instance
-sed  -i -e "s%msb.onap.org:8082/%${MULTICLOUDSIM_IP}:8082/%g" /tmp/conductor/properties/conductor.conf
-
-AAFSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aafsim`
-echo "AAFSIM_IP=${AAFSIM_IP}"
-
-# change AAF reference to the local instance
-sed  -i -e "s%localhost:8100/%${AAFSIM_IP}:8100/%g" /tmp/conductor/properties/conductor.conf
-
-#SMS
-sed  -i -e "s%aaf-sms.onap:10443%${SMS_IP}:10443%g" /tmp/conductor/properties/conductor.conf
-#Preload secrets
-docker exec --user root -i sms /bin/sh -c "mkdir -p /preload/config"
-docker cp /tmp/sms/properties/has.json sms:/preload/config/has.json
-docker exec --user root -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost"
-docker logs vault
-
-#onboard conductor into music
-echo "Query MUSIC to check for reachability. Query Version"
-curl -vvvvv --noproxy "*" --request GET http://${MUSIC_IP}:8080/MUSIC/rest/v2/version -H "Content-Type: application/json"
-
-echo "Onboard conductor into music"
-curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" -H "Authorization: Basic Y29uZHVjdG9yOmMwbmR1Y3Qwcg==" --data @${WORKSPACE}/tests/optf-has/has/data/onboard.json
-
-docker run -d --name cond-cont --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
-sleep 15
-docker run -d --name cond-api --user root -p "8091:8091" -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf
-sleep 15
-docker run -d --name cond-solv --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf
-sleep 15
-docker run -d --name cond-resv --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
-sleep 5
-docker run -d --name cond-data --user root -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf -v ${BUNDLE}:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
-sleep 15
-
-COND_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' cond-api`
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${COND_IP} 8091
-
-echo "inspect docker things for tracing purpose"
-docker inspect cond-data
-docker inspect cond-cont
-docker inspect cond-api
-docker inspect cond-solv
-docker inspect cond-resv
-
-echo "dump music content just after conductor is started"
-docker exec music-db /usr/bin/nodetool status
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
diff --git a/scripts/optf-has/has/has_teardown_script.sh b/scripts/optf-has/has/has_teardown_script.sh
deleted file mode 100755
index bef28b43..00000000
--- a/scripts/optf-has/has/has_teardown_script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "print meaningful data before scratching everything"
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM conductor.plans'
-
-echo "optf/has scripts docker containers killing";
-docker stop cond-api
-docker stop cond-solv
-docker stop cond-cont
-docker stop cond-data
-docker stop cond-resv
-
-docker rm cond-api
-docker rm cond-solv
-docker rm cond-cont
-docker rm cond-data
-docker rm cond-resv
-
diff --git a/scripts/optf-has/has/music-properties/log4j.properties b/scripts/optf-has/has/music-properties/log4j.properties
deleted file mode 100644
index 1312e9bb..00000000
--- a/scripts/optf-has/has/music-properties/log4j.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# No longer needed, please see the logback properties
-
-
diff --git a/scripts/optf-has/has/music-properties/music.properties b/scripts/optf-has/has/music-properties/music.properties
deleted file mode 100644
index 02fb52df..00000000
--- a/scripts/optf-has/has/music-properties/music.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-my.public.ip=localhost
-all.public.ips=localhost
-my.id=0
-all.ids=0
-#######################################
-# Optional current values are defaults
-#######################################
-zookeeper.host=music-zk
-cassandra.host=music-db
-#music.ip=localhost
-#debug=true
-#music.rest.ip=localhost
-#lock.lease.period=6000
-cassandra.user=nelson24
-cassandra.password=winman123
-
-
diff --git a/scripts/optf-has/has/music_script.sh b/scripts/optf-has/has/music_script.sh
deleted file mode 100755
index 4257dad7..00000000
--- a/scripts/optf-has/has/music_script.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "### This is ${WORKSPACE}/scripts/optf-has/has/music_script.sh"
-#
-# add here whatever commands is needed to prepare the music setup for optf-has CSIT testing
-#
-
-#
-# add here all the configuration steps eventually needed to be carried out for music CSIT testing
-#
-echo "########## music configuration step ##########";
-CASS_IMG=nexus3.onap.org:10001/onap/music/cassandra_3_11:3.0.23
-CASS_IMG_JOB=nexus3.onap.org:10001/onap/music/cassandra_job:3.0.23
-TOMCAT_IMG=nexus3.onap.org:10001/library/tomcat:8.5
-ZK_IMG=nexus3.onap.org:10001/library/zookeeper:3.4
-BUSYBOX_IMG=nexus3.onap.org:10001/library/busybox:latest
-MUSIC_IMG=nexus3.onap.org:10001/onap/music/music:3.0.23
-TT=10
-WORK_DIR=/tmp/music
-CASS_USERNAME=nelson24
-CASS_PASSWORD=winman123
-MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/scripts/optf-has/has/music-properties
-MUSIC_PROPERTIES=/tmp/music/properties
-MUSIC_LOGS=/tmp/music/logs
-CQL_FILES=${WORKSPACE}/scripts/music/cql
-MUSIC_TRIGGER_DIR=/tmp/triggers
-TRIGGER_JAR=musictrigger-0.1.0.jar
-TRIGGER_JAR_URL=https://nexus.onap.org/service/local/repositories/autorelease-72298/content/org/onap/music/musictrigger/0.1.0/musictrigger-0.1.0.jar
-
-mkdir -p ${MUSIC_PROPERTIES}
-mkdir -p ${MUSIC_LOGS}
-mkdir -p ${MUSIC_LOGS}/MUSIC
-mkdir -p /tmp/triggers
-
-# Get Trigger
-echo "########## Get Trigger Jar ##########"
-curl -o $MUSIC_TRIGGER_DIR/$TRIGGER_JAR $TRIGGER_JAR_URL
-
-cp ${MUSIC_SOURCE_PROPERTIES}/* ${WORK_DIR}/properties
-
-# Create Volume for mapping war file and tomcat
-echo "########## create music-vol ##########"
-docker volume create --name music-vol;
-
-# Create a network for all the containers to run in.
-echo "########## create music-net ##########"
-docker network create music-net;
-
-# Start Cassandra
-echo "########## Start Cassandra (music-db) ##########"
-docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001" -p "7199:7199" -p "9042:9042" -p "9160:9160" \
--v $MUSIC_TRIGGER_DIR/$TRIGGER_JAR:/etc/cassandra/triggers/$TRIGGER_JAR \
-${CASS_IMG};
-
-# See if cassandra is up.
-echo "########## Running Test to see if Cassandra is up ##########"
-CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db`
-echo "CASSANDRA_IP=${CASSA_IP}"
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
-
-# Sleep 60 seconds to ensure Cassandra is up and running.
-sleep 60;
-
-# Check to see if Keyspaces are there.
-docker exec music-db cqlsh -u cassandra -p cassandra -e "DESCRIBE keyspaces;"
-
-# Load data into Cassandra via Cassandra Job
-echo "########## Running Cassandra Job (music-job) to load cql files ##########"
-docker run -d --name music-job --network music-net \
--v $CQL_FILES/admin.cql:/cql/admin.cql \
--v $CQL_FILES/admin_pw.cql:/cql/admin_pw.cql \
--v $CQL_FILES/extra:/cql/extra \
--e PORT=9042 \
--e CASS_HOSTNAME=music-db \
--e USERNAME=$CASS_USERNAME \
--e PASSWORD=$CASS_PASSWORD \
-$CASS_IMG_JOB
-
-sleep 70;
-
-# Logs
-echo "########## Cassandra Job logs ##########"
-docker logs music-job
-# Check to see if Keyspaces are there.
-# "############## Check if new username and password work ##########"
-docker exec music-db cqlsh -u $CASS_USERNAME -p $CASS_PASSWORD -e "DESCRIBE keyspaces;"
-# Check to see if Keyspaces are there.
-# "############## Check if original username and password work ##########"
-docker exec music-db cqlsh -u cassandra -p cassandra -e "DESCRIBE keyspaces;"
-# Check to see if Keyspaces are there.
-# "############## Check if new cassandra username and password work ##########"
-docker exec music-db cqlsh -u cassandra -p SomeLongRandomStringNoonewillthinkof -e "DESCRIBE keyspaces;"
-
-
-# Start Music war
-echo "########## Start music-war ##########"
-docker run -d --name music-war -v music-vol:/app ${MUSIC_IMG};
-
-# Start Zookeeper
-echo "########## Start zookeeper (music-zk) ##########"
-docker run -d --name music-zk --network music-net -p "2181:2181" -p "2888:2888" -p "3888:3888" ${ZK_IMG};
-
-ZOO_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-zk`
-echo "ZOOKEEPER_IP=${ZOO_IP}"
-
-# Delay  between Cassandra/Zookeeper and Tomcat
-sleep 120;
-
-# Start Up tomcat - Needs to have properties,logs dir and war file volume mapped.
-echo "########## Start Tomcat (music-tomcat) ##########"
-docker run -d --name music-tomcat --network music-net -p "8080:8080" -v music-vol:/usr/local/tomcat/webapps -v ${WORK_DIR}/properties:/opt/app/music/etc:ro -v ${WORK_DIR}/logs:/opt/app/music/logs ${TOMCAT_IMG};
-
-# Connect tomcat to host bridge network so that its port can be seen.
-echo "########## Create Bridge for Tomcat ##########"
-docker network connect bridge music-tomcat;
-
-TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
-echo "TOMCAT_IP=${TOMCAT_IP}"
-
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${TOMCAT_IP} 8080
-
-sleep 20;
-echo "########## TOMCAT Logs ##########"
-docker logs music-tomcat
-# Needed only if we need to look at localhost logs.
-echo "########## MUSIC localhost Log ##########"
-docker exec music-tomcat /bin/bash -c "cat /usr/local/tomcat/logs/localhost*"
-
-echo "########## MUSIC Log ##########"
-ls -al $MUSIC_LOGS/MUSIC
-docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/music.log"
-#echo "########## MUSIC error log ##########"
-#docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/error.log"
-
-echo "########## inspect docker things for tracing purpose ##########"
-docker inspect music-db
-docker inspect music-zk
-docker inspect music-tomcat
-docker inspect music-war
-docker volume inspect music-vol
-docker network inspect music-net
-
-echo "########## dump music content just after music is started ##########"
-docker exec music-db /usr/bin/nodetool status
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'DESCRIBE keyspace admin'
-docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
-
-
-#
-# add here all ROBOT_VARIABLES settings
-#
-echo "########## music robot variables settings ##########";
-ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://${TOMCAT_IP} -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091"
-
-echo ${ROBOT_VARIABLES}
-
-
-
diff --git a/scripts/optf-has/has/music_teardown_script.sh b/scripts/optf-has/has/music_teardown_script.sh
deleted file mode 100755
index 2e7d707b..00000000
--- a/scripts/optf-has/has/music_teardown_script.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-#
-# add here below the killing of all docker containers used for music CSIT testing
-#
-echo "dump music.log files"
-ls -alF /tmp/music
-ls -alFR /tmp/music
-ls -alF /tmp/music/properties
-cat /tmp/music/properties/music.properties
-echo "===== MUSIC log =================="
-docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/music.log"
-#cat /tmp/music/logs/MUSIC/music.log
-echo "===== MUSIC error log =================="
-docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/error.log"
-#cat /tmp/music/logs/MUSIC/error.log
-
-echo "##########################################################";
-echo "#";
-echo "# music scripts docker containers killing";
-echo "#";
-echo "##########################################################";
-docker stop music-tomcat
-docker stop music-war
-docker stop music-zk
-docker stop music-job
-docker stop music-db
-
-docker rm music-zk
-docker rm music-tomcat
-docker rm music-war
-docker rm music-job
-docker rm music-db
-
-docker network rm music-net;
-sleep 5;
-
-docker volume rm music-vol
-
-#rm -Rf /tmp/music
-
-
-
-
-
diff --git a/scripts/optf-has/has/setup-sms.sh b/scripts/optf-has/has/setup-sms.sh
deleted file mode 100755
index e6a4b227..00000000
--- a/scripts/optf-has/has/setup-sms.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Not sure why this is needed.
-source ${SCRIPTS}/common_functions.sh
-
-CONFIG_FILE=$(pwd)/config/smsconfig.json
-
-mkdir -p $(pwd)/config
-
-docker login -u docker -p docker nexus3.onap.org:10001
-docker pull nexus3.onap.org:10001/onap/aaf/sms
-docker pull docker.io/vault:1.3.3
-
-#
-# Running vault in dev server mode here for CSIT
-# In HELM it runs in production mode
-#
-docker run -e "VAULT_DEV_ROOT_TOKEN_ID=aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee" \
-           -e SKIP_SETCAP=true \
-           --name vault -d -p 8200:8200 vault:1.3.3
-
-SMSDB_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vault)
-cat << EOF > $CONFIG_FILE
-{
-    "cafile": "auth/selfsignedca.pem",
-    "servercert": "auth/server.cert",
-    "serverkey":  "auth/server.key",
-
-    "smsdbaddress":     "http://$SMSDB_IP:8200",
-    "vaulttoken":       "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-    "disable_tls": true
-}
-EOF
-
-cat $CONFIG_FILE
-
-docker run --workdir /sms -v $CONFIG_FILE:/sms/smsconfig.json \
-           --name sms -d -p 10443:10443 --user root nexus3.onap.org:10001/onap/aaf/sms
-
-SMS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sms)
-
-echo "###### WAITING FOR ALL CONTAINERS TO COME UP"
-sleep 20
-for i in {1..20}; do
-    curl -sS -m 1 http://${SMSDB_IP}:8200/v1/sys/seal-status && break
-    echo sleep $i
-    sleep $i
-done
-
-#
-# add here all ROBOT_VARIABLES settings
-#
-echo "# sms robot variables settings";
-ROBOT_VARIABLES="-v SMS_HOSTNAME:http://${SMS_IP} -v SMS_PORT:10443"
-
-echo ${ROBOT_VARIABLES}
diff --git a/scripts/optf-has/has/simulator_script.sh b/scripts/optf-has/has/simulator_script.sh
deleted file mode 100755
index a3e4faa6..00000000
--- a/scripts/optf-has/has/simulator_script.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "### This is ${WORKSPACE}/scripts/optf-has/has/simulator_script.sh"
-#
-# add here whatever commands is needed to prepare the optf/has CSIT testing
-#
-
-# assume the base is /tmp dir
-DIR=/tmp
-
-# the directory of the script
-echo ${DIR}
-cd ${DIR}
-
-# the temp directory used, within $DIR
-# omit the -p parameter to create a temporal directory in the default location
-WORK_DIR=`mktemp -d -p "$DIR"`
-echo ${WORK_DIR}
-cd ${WORK_DIR}
-
-# clone optf-has project
-git clone https://gerrit.onap.org/r/optf/has
-
-#echo "i am ${USER} : only non jenkins users may need proxy settings"
-if [ ${USER} != 'jenkins' ]; then
-
-    # add proxy settings into this script when you work behind a proxy
-    ${WORKSPACE}/scripts/optf-has/has/has_proxy_settings.sh ${WORK_DIR}
-
-fi
-
-# prepare aaisim
-cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/
-
-# run aaisim
-./run_aaisim.sh
-
-AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim`
-echo "AAISIM_IP=${AAISIM_IP}"
-
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${AAISIM_IP} 8081
-
-# prepare multicloudsim
-cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/multicloudsim/
-
-# check Dockerfile content
-cat ./Dockerfile
-
-# build multicloudsim
-docker build -t multicloudsim .
-
-# run multicloudsim
-docker run -d --name multicloudsim -p 8082:8082  multicloudsim
-
-MULTICLOUDSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' multicloudsim`
-echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
-
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${MULTICLOUDSIM_IP} 8082
-
-
-# prepare sdcsim
-cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/sdcsim/
-
-# check Dockerfile content
-cat ./Dockerfile
-
-# build multicloudsim
-docker build -t sdcsim .
-
-# run multicloudsim
-docker run -d --name sdcsim -p 9595:9595  sdcsim
-
-SDCSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' sdcsim`
-echo "SDCSIM_IP=${SDCSIM_IP}"
-
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${SDCSIM_IP} 9595
-
-
-# prepare aafsim
-echo "simulator_script: prepare aafsim "
-cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/aafsim/
-
-# check Dockerfile content
-echo "simulator_script: Dockerfile "
-cat ./Dockerfile
-
-# build aafsim
-echo "simulator_script: build docker "
-docker build -t aafsim .
-
-# run aafsim
-echo "simulator_script: run docker "
-docker run -d --name aafsim -p 8100:8100 aafsim
-
-AAFSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aafsim`
-echo "simulator_script: AAFSIM_IP=${AAFSIM_IP}"
-
-#echo "simulator_script: wait_for_port"
-${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${AAFSIM_IP} 8100
-
-# wait a while before continuing
-sleep 2
-
-echo "inspect docker things for tracing purpose"
-docker inspect aaisim
-docker inspect multicloudsim
-docker inspect aafsim
diff --git a/scripts/optf-has/has/simulator_teardown_script.sh b/scripts/optf-has/has/simulator_teardown_script.sh
deleted file mode 100755
index 14b38868..00000000
--- a/scripts/optf-has/has/simulator_teardown_script.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-echo "optf/has scripts docker containers killing";
-docker stop aaisim
-docker stop multicloudsim
-docker stop aafsim
-docker stop sdcsim
-
-docker rm aaisim
-docker rm multicloudsim
-docker rm aafsim
-docker rm sdcsim
\ No newline at end of file
diff --git a/scripts/optf-has/has/wait_for_port.sh b/scripts/optf-has/has/wait_for_port.sh
deleted file mode 100755
index 10f08ded..00000000
--- a/scripts/optf-has/has/wait_for_port.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-if [[ $# -ne 2 ]]; then
-	echo "Usage: wait-for-port hostname port" >&2
-	exit 1
-fi
-
-host=$1
-port=$2
-
-echo "Waiting for $host port $port open"
-until telnet $host $port </dev/null 2>/dev/null | grep -q '^Connected'; do
-	sleep 1
-done
-
-echo "$host port $port is open"
-
-exit 0
diff --git a/scripts/optf-osdf/osdf/osdf-properties/aaf_root_ca.cer b/scripts/optf-osdf/osdf/osdf-properties/aaf_root_ca.cer
deleted file mode 100644
index e9a50d7e..00000000
--- a/scripts/optf-osdf/osdf/osdf-properties/aaf_root_ca.cer
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV
-BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx
-NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK
-DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7
-XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn
-H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM
-pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7
-NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg
-2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY
-wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd
-ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM
-P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6
-aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY
-PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G
-A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ
-UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN
-BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz
-L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9
-7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx
-c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf
-jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2
-RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h
-PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF
-CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+
-Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A
-cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR
-ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX
-dYY=
------END CERTIFICATE-----
diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf.json b/scripts/optf-osdf/osdf/osdf-properties/osdf.json
deleted file mode 100644
index ae059f3e..00000000
--- a/scripts/optf-osdf/osdf/osdf-properties/osdf.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "domain": {
-        "name": "osdf",
-        "secrets": [
-            {
-                "name": "so",
-                "values": {
-                    "UserName": "",
-                    "Password": ""
-                }
-            },
-            {
-                "name": "conductor",
-                "values": {
-                    "UserName": "admin1",
-                    "Password": "plan.15"
-                }
-            },
-            {
-                "name": "policyPlatform",
-                "values": {
-                    "UserName": "testpdp",
-                    "Password": "alpha123"
-                }
-            },
-            {
-                "name": "policyClient",
-                "values": {
-                    "UserName": "python",
-                    "Password": "test"
-                }
-            },
-            {
-                "name": "dmaap",
-                "values": {
-                    "UserName": "NA",
-                    "Password": "NA"
-                }
-            },
-            {
-                "name": "sdc",
-                "values": {
-                    "UserName": "NA",
-                    "Password": "NA"
-                }
-            },
-            {
-                "name": "osdfPlacement",
-                "values": {
-                    "UserName": "test",
-                    "Password": "testpwd"
-                }
-            },
-            {
-                "name": "osdfPlacementSO",
-                "values": {
-                    "UserName": "so_test",
-                    "Password": "so_testpwd"
-                }
-            },
-            {
-                "name": "osdfPlacementVFC",
-                "values": {
-                    "UserName": "vfc_test",
-                    "Password": "vfc_testpwd"
-                }
-            },
-            {
-                "name": "osdfCMScheduler",
-                "values": {
-                    "UserName": "test1",
-                    "Password": "testpwd1"
-                }
-            },
-            {
-                "name": "configDb",
-                "values": {
-                    "UserName": "osdf",
-                    "Password": "passwd"
-                }
-            },
-            {
-                "name": "pciHMS",
-                "values": {
-                    "UserName": "",
-                    "Password": ""
-                }
-            },
-            {
-                "name": "osdfPCIOpt",
-                "values": {
-                    "UserName": "pci_test",
-                    "Password": "pci_testpwd"
-                }
-            },
-            {
-                "name": "osdfOptEngine",
-                "values": {
-                    "UserName": "opt_test",
-                    "Password": "opt_testpwd"
-                }
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml
deleted file mode 100755
index 95856df8..00000000
--- a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-placementVersioningEnabled: False
-
-# Placement API latest version numbers to be set in HTTP header
-placementMajorVersion: "1"
-placementMinorVersion: "0"
-placementPatchVersion: "0"
-
-# Placement API default version numbers to be set in HTTP header
-placementDefaultMajorVersion: "1"
-placementDefaultMinorVersion: "0"
-placementDefaultPatchVersion: "0"
-
-# Config for Conductor
-conductorUrl: "http://127.0.0.1:5000/simulated/oof/has-api/flow1-success-simple/main.json"
-conductorPingWaitTime: 2  # seconds to wait before calling the conductor retry URL
-conductorMaxRetries: 5  # if we don't get something in 30 minutes, give up
-# versions to be set in HTTP header
-conductorMinorVersion: 0
-
-# Policy Platform -- requires ClientAuth, Authorization, and Environment
-policyPlatformUrl: http://127.0.0.1:5000/simulated/policy/pdpx/decision/v1 # Policy Dev platform URL
-policyPlatformEnv: TEST  # Environment for policy platform
-
-# Config for DMaaP
-messageReaderHosts: https://DMAAP-HOST1:3905,https://DMAAP-HOST2:3905,https://DMAAP-HOST3:3905
-messageReaderTopic: org.onap.oof.osdf.multicloud
-
-# Config for SDC
-sdcUrl: https://SDC-HOST:8443/sdc/v1/catalog
-sdcONAPInstanceID: ONAP-OSDF
-
-osdfPlacementUrl: "http://127.0.0.1:24699/osdf/api/v2/placement"
-
-is_aaf_enabled: False
-aaf_cache_expiry_hrs: 3
-aaf_url: https://aaftest.simpledemo.onap.org:8095
-aaf_user_roles:
-    - /api/oof/v1/placement:org.onap.osdf.access|*|read ALL
-
-# Secret Management Service from AAF
-aaf_sms_url: http://aaf-sms.onap:10443
-aaf_sms_timeout: 30
-secret_domain: osdf
-aaf_ca_certs: ssl_certs/aaf_root_ca.cer
-
-# config db api
-configDbUrl: http://127.0.0.1:5000/simulated/configdb
-configDbGetCellListUrl: 'getCellList'
-configDbGetNbrListUrl: 'getNbrList'
-
-#key
-appkey:
diff --git a/scripts/optf-osdf/osdf/osdf_proxy_settings.sh b/scripts/optf-osdf/osdf/osdf_proxy_settings.sh
deleted file mode 100755
index b68fca97..00000000
--- a/scripts/optf-osdf/osdf/osdf_proxy_settings.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-# put into this file local proxy settings in case they are needed on your local environment
-echo "### This is ${WORKSPACE}/scripts/optf-osdf/osdf/osdf_proxy_settings.sh"
-
-echo "optf/osdf proxy settings"
-if [ "$#" -eq  "1" ]; then
-     echo "$1"
-     cd $1
-     pwd
-else
-     exit 1
-fi
-
-# don't remove following lines: commands can be attached here
-
-
diff --git a/scripts/optf-osdf/osdf/osdf_script.sh b/scripts/optf-osdf/osdf/osdf_script.sh
deleted file mode 100755
index 2f2d0c90..00000000
--- a/scripts/optf-osdf/osdf/osdf_script.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-echo "### This is ${WORKSPACE}/scripts/optf-osdf/osdf/osdf_script.sh"
-#
-# add here whatever commands is needed to prepare the optf/osdf CSIT testing
-#
-
-# assume the base is /tmp dir
-DIR=/tmp
-
-# the directory of the script
-echo ${DIR}
-cd ${DIR}
-
-# create directory for volume and copy configuration file
-# run docker containers
-OSDF_CONF=/tmp/osdf/properties/osdf_config.yaml
-IMAGE_NAME=nexus3.onap.org:10001/onap/optf-osdf
-IMAGE_VER=2.0.3-SNAPSHOT-latest
-
-mkdir -p /tmp/osdf/properties
-mkdir -p /tmp/sms/properties
-
-cp ${WORKSPACE}/scripts/optf-osdf/osdf/osdf-properties/*.yaml /tmp/osdf/properties/.
-cp ${WORKSPACE}/scripts/optf-osdf/osdf/osdf-properties/osdf.json /tmp/sms/properties/.
-
-#change conductor/configdb simulator urls
-OSDF_SIM_IP=`get-instance-ip.sh osdf_sim`
-echo "OSDF_SIM_IP=${OSDF_SIM_IP}"
-SMS_IP=`get-instance-ip.sh sms`
-echo "SMS_IP=${SMS_IP}"
-
-sed  -i -e "s%127.0.0.1:5000%${OSDF_SIM_IP}:5000%g" $OSDF_CONF
-sed  -i -e "s%aaf-sms.onap:10443%${SMS_IP}:10443%g" $OSDF_CONF
-
-#Preload secrets
-docker exec --user root -i sms  /bin/sh -c "mkdir -p /preload/config"
-docker cp /tmp/sms/properties/osdf.json sms:/preload/config/osdf.json
-docker exec --user root -i sms  /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost"
-
-docker logs vault
-docker run -d --name optf-osdf -v ${OSDF_CONF}:/opt/osdf/config/osdf_config.yaml -p "8698:8699" ${IMAGE_NAME}:${IMAGE_VER}
-
-sleep 20
-
-OSDF_IP=`get-instance-ip.sh optf-osdf`
-${WORKSPACE}/scripts/optf-osdf/osdf/wait_for_port.sh ${OSDF_IP} 8699
-
-echo "inspect docker things for tracing purpose"
-docker inspect optf-osdf
diff --git a/scripts/optf-osdf/osdf/setup-sms.sh b/scripts/optf-osdf/osdf/setup-sms.sh
deleted file mode 100755
index e6a4b227..00000000
--- a/scripts/optf-osdf/osdf/setup-sms.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Not sure why this is needed.
-source ${SCRIPTS}/common_functions.sh
-
-CONFIG_FILE=$(pwd)/config/smsconfig.json
-
-mkdir -p $(pwd)/config
-
-docker login -u docker -p docker nexus3.onap.org:10001
-docker pull nexus3.onap.org:10001/onap/aaf/sms
-docker pull docker.io/vault:1.3.3
-
-#
-# Running vault in dev server mode here for CSIT
-# In HELM it runs in production mode
-#
-docker run -e "VAULT_DEV_ROOT_TOKEN_ID=aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee" \
-           -e SKIP_SETCAP=true \
-           --name vault -d -p 8200:8200 vault:1.3.3
-
-SMSDB_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vault)
-cat << EOF > $CONFIG_FILE
-{
-    "cafile": "auth/selfsignedca.pem",
-    "servercert": "auth/server.cert",
-    "serverkey":  "auth/server.key",
-
-    "smsdbaddress":     "http://$SMSDB_IP:8200",
-    "vaulttoken":       "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-    "disable_tls": true
-}
-EOF
-
-cat $CONFIG_FILE
-
-docker run --workdir /sms -v $CONFIG_FILE:/sms/smsconfig.json \
-           --name sms -d -p 10443:10443 --user root nexus3.onap.org:10001/onap/aaf/sms
-
-SMS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sms)
-
-echo "###### WAITING FOR ALL CONTAINERS TO COME UP"
-sleep 20
-for i in {1..20}; do
-    curl -sS -m 1 http://${SMSDB_IP}:8200/v1/sys/seal-status && break
-    echo sleep $i
-    sleep $i
-done
-
-#
-# add here all ROBOT_VARIABLES settings
-#
-echo "# sms robot variables settings";
-ROBOT_VARIABLES="-v SMS_HOSTNAME:http://${SMS_IP} -v SMS_PORT:10443"
-
-echo ${ROBOT_VARIABLES}
diff --git a/scripts/optf-osdf/osdf/simulator_script.sh b/scripts/optf-osdf/osdf/simulator_script.sh
deleted file mode 100755
index 8f3f7d36..00000000
--- a/scripts/optf-osdf/osdf/simulator_script.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-echo "### This is ${WORKSPACE}/scripts/optf-osdf/osdf/simulator_script.sh"
-#
-# add here whatever commands is needed to prepare the optf/osdf CSIT testing
-#
-# assume the base is /tmp dir
-
-DIR=/tmp
-
-# the directory of the script
-echo ${DIR}
-cd ${DIR}
-
-# the temp directory used, within $DIR
-# omit the -p parameter to create a temporal directory in the default location
-WORK_DIR=`mktemp -d -p "$DIR"`
-echo ${WORK_DIR}
-cd ${WORK_DIR}
-
-# clone optf-osdf project
-git clone https://gerrit.onap.org/r/optf/osdf
-
-#echo "i am ${USER} : only non jenkins users may need proxy settings"
-if [ ${USER} != 'jenkins' ]; then
-
-    # add proxy settings into this script when you work behind a proxy
-    ${WORKSPACE}/scripts/optf-osdf/osdf/osdf_proxy_settings.sh ${WORK_DIR}
-
-fi
-
-# prepare osdf_sim
-cd ${WORK_DIR}/osdf/test/functest/simulators
-
-# check Dockerfile content
-cat ./Dockerfile
-
-# build osdf_sim
-chmod +x ./build_sim_image.sh
-./build_sim_image.sh
-
-# run osdf_sim
-docker run -d --name osdf_sim -p "5000:5000"  osdf_sim:latest;
-
-OSDF_SIM_IP=`get-instance-ip.sh osdf_sim`
-echo "OSDF_SIM_IP=${OSDF_SIM_IP}"
-
-${WORKSPACE}/scripts/optf-osdf/osdf/wait_for_port.sh ${OSDF_SIM_IP} 5000
-
-
-# wait a while before continuing
-sleep 2
-
-echo "inspect docker things for tracing purpose"
-docker inspect osdf_sim
-
diff --git a/scripts/optf-osdf/osdf/wait_for_port.sh b/scripts/optf-osdf/osdf/wait_for_port.sh
deleted file mode 100755
index 360fc210..00000000
--- a/scripts/optf-osdf/osdf/wait_for_port.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# -------------------------------------------------------------------------
-#   Copyright (c) 2018 AT&T Intellectual Property
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# -------------------------------------------------------------------------
-#
-
-if [[ $# -ne 2 ]]; then
-	echo "Usage: wait-for-port hostname port" >&2
-	exit 1
-fi
-
-host=$1
-port=$2
-
-echo "Waiting for $host port $port open"
-until telnet $host $port </dev/null 2>/dev/null | grep -q '^Connected'; do
-	sleep 1
-done
-
-echo "$host port $port is open"
-
-exit 0