From 05fe114a5969727c32cd9f1051cd7b9fde0344d5 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Mon, 19 Apr 2021 12:46:16 +0200 Subject: Reorganization of devicemanager directory structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Organized into core, onap and o-ran-sc directories Issue-ID: CCSDK-3242 Signed-off-by: Ravi Pendurty Change-Id: I3c23710f990a2d96ba01104c97315fc8c6b1921b Signed-off-by: Ravi Pendurty Signed-off-by: Michael DÜrre --- .../src/test/resources/aaiclient.properties | 165 --------------------- .../provider/src/test/resources/captured-akka.conf | 72 --------- .../src/test/resources/mediator-server.json | 18 --- .../src/test/resources/simplelogger.properties | 61 -------- .../provider/src/test/resources/test.properties | 76 ---------- 5 files changed, 392 deletions(-) delete mode 100644 sdnr/wt/devicemanager/provider/src/test/resources/aaiclient.properties delete mode 100644 sdnr/wt/devicemanager/provider/src/test/resources/captured-akka.conf delete mode 100644 sdnr/wt/devicemanager/provider/src/test/resources/mediator-server.json delete mode 100644 sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties delete mode 100644 sdnr/wt/devicemanager/provider/src/test/resources/test.properties (limited to 'sdnr/wt/devicemanager/provider/src/test/resources') diff --git a/sdnr/wt/devicemanager/provider/src/test/resources/aaiclient.properties b/sdnr/wt/devicemanager/provider/src/test/resources/aaiclient.properties deleted file mode 100644 index 3e4da05b0..000000000 --- a/sdnr/wt/devicemanager/provider/src/test/resources/aaiclient.properties +++ /dev/null @@ -1,165 +0,0 @@ -### - -# ============LICENSE_START======================================================= - -# openECOMP : SDN-C - -# ================================================================================ - -# Copyright (C) 2017 AT&T Intellectual Property. All rights - -# reserved. - -# ================================================================================ - -# 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. - -# ============LICENSE_END========================================================= - -### - - - -# - -# Configuration file for A&AI Client - -# - - - -# - -# Certificate keystore and truststore - -# - -org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/logs/externals/data/stores/truststore.client.jks - -org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin - - - -org.onap.ccsdk.sli.adaptors.aai.ssl.key=/opt/logs/externals/data/stores/keystore.client.p12 - -org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd=adminadmin - -org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true - - - -org.onap.ccsdk.sli.adaptors.aai.application=SDNC - - - -#org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-int1.test.att.com:8443 - -org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-pwt3.ecomp.cci.att.com:8443 - - - -connection.timeout=60000 - -read.timeout=60000 - - - -# query - -org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v13/search/sdn-zone-query - -org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v13/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} - -org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v13/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 - - - -# named query - -org.onap.ccsdk.sli.adaptors.aai.query.named=/aai/search/named-query - - - -#update - -org.onap.ccsdk.sli.adaptors.aai.update=/aai/v13/actions/update - - - -# UBB Notify - -org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v13/actions/notify - -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} - -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information - - - -# P-Interfaces - -org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v13/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces - -org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v13/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} - - - -# VNF IMAGES - -org.onap.ccsdk.sli.adaptors.aai.path.vnf.images=/aai/v13/service-design-and-creation/vnf-images - -org.onap.ccsdk.sli.adaptors.aai.path.vnf.image=/aai/v13/service-design-and-creation/vnf-images/vnf-image/{att-uuid} - -org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v13/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} - - - -# service instance - -org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v13/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance - -org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v13/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} - - - -# VNF IMAGES QUERY - -org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v13/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} - - - -# - -# Formatting - -# - -org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s - -org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type - -org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id - -org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type - - \ No newline at end of file diff --git a/sdnr/wt/devicemanager/provider/src/test/resources/captured-akka.conf b/sdnr/wt/devicemanager/provider/src/test/resources/captured-akka.conf deleted file mode 100644 index 8489f0905..000000000 --- a/sdnr/wt/devicemanager/provider/src/test/resources/captured-akka.conf +++ /dev/null @@ -1,72 +0,0 @@ - -odl-cluster-data { - - akka { - loglevel = "" - remote { - netty.tcp { - hostname = "zltcdyh1arbc02.2f0377.dyh1a.tci.att.com" - port = 2550 - } - } - actor { - debug{ - autoreceive = on - lifecycle = on - unhandled = on - fsm = on - event-stream = on - } - } - cluster { - seed-nodes = ["akka.tcp://opendaylight-cluster-data@zltcdyh1arbc01.2f0377.dyh1a.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1arbc02.2f0377.dyh1a.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1arbc03.2f0377.dyh1a.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1brbc01.f84e7a.dyh1b.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1brbc02.f84e7a.dyh1b.tci.att.com:2550", "akka.tcp://opendaylight-cluster-data@zltcdyh1brbc03.f84e7a.dyh1b.tci.att.com:2550"] - seed-node-timeout = 15s - roles = ["member-2"] - - } - persistence { - journal-plugin-fallback { - circuit-breaker { - max-failures = 10 - call-timeout = 60s - reset-timeout = 30s - } - } - } - } -} - -odl-cluster-rpc { - - akka { - loglevel = "" - remote { - netty.tcp { - hostname = "zltcdyh1arbc02.2f0377.dyh1a.tci.att.com" - port = 2551 - } - } - actor { - debug{ - autoreceive = on - lifecycle = on - unhandled = on - fsm = on - event-stream = on - } - } - cluster { - seed-nodes = ["akka.tcp://odl-cluster-rpc@zltcdyh1arbc01.2f0377.dyh1a.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1arbc02.2f0377.dyh1a.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1arbc03.2f0377.dyh1a.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1brbc01.f84e7a.dyh1b.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1brbc02.f84e7a.dyh1b.tci.att.com:2551", "akka.tcp://odl-cluster-rpc@zltcdyh1brbc03.f84e7a.dyh1b.tci.att.com:2551"] - seed-node-timeout = 15s - } - persistence { - journal-plugin-fallback { - circuit-breaker { - max-failures = 10 - call-timeout = 60s - reset-timeout = 30s - } - } - } - } -} diff --git a/sdnr/wt/devicemanager/provider/src/test/resources/mediator-server.json b/sdnr/wt/devicemanager/provider/src/test/resources/mediator-server.json deleted file mode 100644 index c7db70121..000000000 --- a/sdnr/wt/devicemanager/provider/src/test/resources/mediator-server.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "uri":"/mwtn/mediator-server/_query", - "method":"DELETE", - "body":{"query":{"match_all":{}}} - }, - - { - "uri":"/mwtn/mediator-server/1", - "method":"POST", - "body":{ - "id": 1, - "name": "internal mediatorserver", - "url": "http://192.168.178.89:7070" - - } - } -] diff --git a/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties deleted file mode 100644 index 1c2f131c5..000000000 --- a/sdnr/wt/devicemanager/provider/src/test/resources/simplelogger.properties +++ /dev/null @@ -1,61 +0,0 @@ -# -# ============LICENSE_START======================================================= -# ONAP : ccsdk features -# ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# 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. -# ============LICENSE_END======================================================= -# -# - -# SLF4J's SimpleLogger configuration file -# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err. - -# Default logging detail level for all instances of SimpleLogger. -# Must be one of ("trace", "debug", "info", "warn", or "error"). -# If not specified, defaults to "info". -org.slf4j.simpleLogger.defaultLogLevel=debug - -# Logging detail level for a SimpleLogger instance named "xxx.yyy.zzz". -# Must be one of ("trace", "debug", "info", "warn", or "error"). -# If not specified, the default logging detail level is used. -# org.slf4j.simpleLogger.log.xxx.yyy=debug -org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info -org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.test=debug -org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.database=debug -org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=info -org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info -org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info - -# Set to true if you want the current date and time to be included in output messages. -# Default is false, and will output the number of milliseconds elapsed since startup. -#org.slf4j.simpleLogger.showDateTime=false - -# The date and time format to be used in the output messages. -# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat. -# If the format is not specified or is invalid, the default format is used. -# The default format is yyyy-MM-dd HH:mm:ss:SSS Z. -#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z - -# Set to true if you want to output the current thread name. -# Defaults to true. -#org.slf4j.simpleLogger.showThreadName=true - -# Set to true if you want the Logger instance name to be included in output messages. -# Defaults to true. -#org.slf4j.simpleLogger.showLogName=true - -# Set to true if you want the last component of the name to be included in output messages. -# Defaults to false. -#org.slf4j.simpleLogger.showShortLogName=false diff --git a/sdnr/wt/devicemanager/provider/src/test/resources/test.properties b/sdnr/wt/devicemanager/provider/src/test/resources/test.properties deleted file mode 100644 index 9290a88ba..000000000 --- a/sdnr/wt/devicemanager/provider/src/test/resources/test.properties +++ /dev/null @@ -1,76 +0,0 @@ -# -# ============LICENSE_START======================================================= -# ONAP : ccsdk features -# ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# 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. -# ============LICENSE_END======================================================= -# -# - -[dcae] -dcaeUserCredentials=admin:admin -dcaeUrl=off -dcaeHeartbeatPeriodSeconds=120 -dcaeTestCollector=no - -[aots] -userPassword=passwd -soapurladd=off -soapaddtimeout=10 -soapinqtimeout=20 -userName=user -inqtemplate=inqreq.tmpl.xml -assignedto=userid -addtemplate=addreq.tmpl.xml -severitypassthrough=critical,major,minor,warning -systemuser=user -prt-offset=1200 -soapurlinq=off -#smtpHost= -#smtpPort= -#smtpUsername= -#smtpPassword= -#smtpSender= -#smtpReceivers= - -[es] -esCluster=sendateodl5 -#time limit to keep increasing data in database [in seconds] -#60*60*24*30 (30days) -esArchiveLimit=2592000 -#folder where removed data will be stored -esArchiveFolder=./backup -#interval to archive database [in seconds] -#60*60*24 (1day) -esArchiveInterval=86400 - -[aai] -#keep comment -aaiHeaders=["X-TransactionId: 9999"] -aaiUrl=http://localhost:81 -aaiUserCredentials=AAI:AAI -aaiDeleteOnMountpointRemove=false -aaiTrustAllCerts=false -aaiApiVersion=aai/v13 -aaiPropertiesFile=aaiclient.properties -aaiApplicationId=SDNR -aaiPcks12ClientCertFile=/opt/logs/externals/data/stores/keystore.client.p12 -aaiPcks12ClientCertPassphrase=adminadmin -aaiClientConnectionTimeout=30000 - -[pm] -pmCluster=sendateodl5 -pmEnabled=true - -- cgit 1.2.3-korg