Remove legacy certificate handling

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4621
Change-Id: I834f2a0a4f73693dbb656dfa9186506bf88c62c1

3 files changed, 0 insertions, 87 deletions

diff --git a/catalog-be/src/main/resources/application-context.xml b/catalog-be/src/main/resources/application-context.xml
index 2b1d5ef3bd..242af542fe 100644
--- a/catalog-be/src/main/resources/application-context.xml
+++ b/catalog-be/src/main/resources/application-context.xml
@@ -31,10 +31,6 @@
       <aop:pointcut id="lockingTransaction" expression="@annotation(org.openecomp.sdc.be.components.impl.lock.LockingTransactional) and args(componentId, componentType,..)"/>
       <aop:around method="lock" arg-names="proceedingJoinPoint,componentId,componentType" pointcut-ref="lockingTransaction"/>
     </aop:aspect>
-    <aop:aspect id="roleAuthorizationAspect" ref="roleAuthorizationHandler">
-      <aop:pointcut id="roleAuthorize" expression="@annotation(permissions)"/>
-      <aop:before method="authorizeRole" arg-names="joinPoint, permissions" pointcut-ref="roleAuthorize"/>
-    </aop:aspect>
   </aop:config>
 
 </beans>
diff --git a/catalog-be/src/main/resources/cadi.properties b/catalog-be/src/main/resources/cadi.properties
deleted file mode 100644
index bbce36124d..0000000000
--- a/catalog-be/src/main/resources/cadi.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-# Configure AAF
-aaf_locate_url=https://aaf.onap.org:8095
-aaf_url=https://aaf.onap.org:8095/locate/
-
-#aaf_url=https://DME2RESOLVE/service=com.att.authz.AuthorizationService/version=2.0/envContext=TEST/routeOffer=BAU_SE
-
-#if you are running aaf service from a docker image you have to use aaf service IP and port number
-aaf_id=sdc@onap
-#Encrypt the password using AAF Jar
-aaf_password= enc:uI_J4jBL4YUcIZZa5uZKj3QMUC63hbS8TmDn5PSp5nO
-# Sample CADI Properties, from CADI 1.4.2
-hostname=onapportal
-csp_domain=PROD
-
-# Add Absolute path to Keyfile
-cadi_keyfile=/var/lib/jetty/opt/be/etc/keyfile
-
-
-# This is required to accept Certificate Authentication from Certman certificates.
-# can be TEST, IST or PROD
-aaf_env=IST
-
-# DEBUG prints off all the properties.  Use to get started.
-cadi_loglevel=DEBUG
-
-
-# Become CSO Poodle Compliant by only allowing sanctioned TLS versions
-# The following is the default
-# cadi_protocols=TLSv1.1,TLSv1.2
-
-# Default TrustStore - REQUIRED for changing PROTOCOL Defaults for DME2
-# Read https://wiki.web.att.com/pages/viewpage.action?pageId=574623569#URGENT:SolvingSSL2-3/TLSv1removalissues-Up-to-dateTruststore
-# Add Absolute path to truststore2018.jks
-cadi_truststore=/var/lib/jetty/base/be/etc/cadi_truststore.jks
-# Note: This is the ONLY password that doesn't have to be encrypted. All Java's TrustStores are this passcode by default, because they are public certs
-cadi_truststore_password=changeit
-
-# how to turn on SSL Logging
-#javax.net.debug=ssl
-
-##
-# Hint
-# Use "maps.bing.com" to get Lat and Long for an Address
-AFT_LATITUDE=32.780140
-AFT_LONGITUDE=-96.800451
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_CLIENT_IGNORE_SSL_CONFIG=true
-DME2.DEBUG=true
-AFT_DME2_HTTP_EXCHANGE_TRACE_ON=true
-
-cadi_latitude=32.780140
-cadi_longitude=-96.800451
-
-aaf_root_ns=com.att.aaf
-aaf_api_version=2.0
diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml
index 820034eca2..8c8ca1cb37 100644
--- a/catalog-be/src/main/resources/config/configuration.yaml
+++ b/catalog-be/src/main/resources/config/configuration.yaml
@@ -129,8 +129,6 @@ cassandraConfig:
     username: asdc_user
     password: Aa1234%^!
     ssl: true
-    truststorePath : /var/lib/jetty/opt/base/be/config/.truststore
-    truststorePassword : Aa123456
     maxWaitSeconds: 120
     keySpaces:
         - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-sdc-iltlv650', '1']}
@@ -817,8 +815,6 @@ dmaapConsumerConfiguration:
         password: XyCUPhFx9u70aklYGo6OiA==
     aftDme2SslEnable: true
     aftDme2ClientIgnoreSslConfig: false
-    aftDme2ClientKeystore: /var/lib/jetty/opt/base/be/config/.truststore
-    aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
     aftDme2ClientSslCertAlias: certman
 
 #Performence microservice dmaap producer
@@ -851,8 +847,6 @@ dmaapProducerConfiguration:
         password: XyCUPhFx9u70aklYGo6OiA==
         aftDme2SslEnable: true
     aftDme2ClientIgnoreSslConfig: false
-    aftDme2ClientKeystore: /var/lib/jetty/opt/jetty/base/be/config/.truststore
-    aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
     aftDme2ClientSslCertAlias: certman
 
 
@@ -895,28 +889,6 @@ healthStatusExclude:
    - DMAAP_PRODUCER
    - ECOMP_PORTAL
 
-aafNamespace: com.att.sdc
-
-aafAuthNeeded: false
-
-cadiFilterParams:
-    hostname: 192.168.33.10
-    csp_domain: PROD
-    cadi_keyfile: /var/lib/jetty/opt/base/be/config/catalog-be/keyfile
-    cadi_loglevel: DEBUG
-    cadi_truststore: /var/lib/jetty/opt/base/be/config/.truststore
-    cadi_truststore_password: enc:XyCUPhFx9u70aklYGo6OiA==
-    #aaf_url: https://aaf.onap.org/service=?
-    aaf_id: aaf@sdc.onap.org
-    aaf_password: enc:XyCUPhFx9u70aklYGo6OiA==
-    aaf_env: DEV
-    aafLocateUrl: https://aaf.api.simpledemo.onap.org:8095
-    aaf_url: https://AAF_LOCATE_URL/AAF_NS.service:2.0
-    AFT_LATITUDE: "32.780140"
-    AFT_LONGITUDE: "-96.800451"
-    AFT_ENVIRONMENT: AFTUAT
-    cadiX509Issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US"
-
 # This configuration entry lists all node type names prefix that shall be allowed on SDC.
 definedResourceNamespace:
   - org.openecomp.resource.