Move CSIT to integration/csit repo

To facilite branching of CSIT tests, all CSIT test
code and scripts are relocated to the integration/csit
repo.

Change-Id: I6777cd414e43dbf2bfa6215f7e50849e1a6a2e59
Issue-ID: INT-671
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

12 files changed, 0 insertions, 797 deletions

diff --git a/test/csit/tests/aai/resources/api_suite/__init__.robot b/test/csit/tests/aai/resources/api_suite/__init__.robot
deleted file mode 100644
index 538def841..000000000
--- a/test/csit/tests/aai/resources/api_suite/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation    Resources - Pserver Suite
diff --git a/test/csit/tests/aai/resources/api_suite/aai.crt b/test/csit/tests/aai/resources/api_suite/aai.crt
deleted file mode 100644
index 6a28bbb8c..000000000
--- a/test/csit/tests/aai/resources/api_suite/aai.crt
+++ /dev/null
@@ -1,70 +0,0 @@
-Bag Attributes
-    friendlyName: aaiopenecomp
-    localKeyID: 54 69 6D 65 20 31 35 30 34 38 33 32 34 34 33 32 39 32 
-subject=/C=US/ST=NJ/L=Bedminster/O=OpenECOMP/OU=SimpleDemo/CN=aai.api.simpledemo.openecomp.org/emailAddress=aai-host@api.simpledemo.openecomp.org
-issuer=/C=US/ST=NJ/L=Bedminster/O=OpenECOMP/OU=simpledemo/CN=OpenECOMP simpledemo Server CA X1/emailAddress=simpledemo@openecomp.org
------BEGIN CERTIFICATE-----
-MIIEiTCCA3GgAwIBAgIJAIPKfDLcn3MpMA0GCSqGSIb3DQEBCwUAMIGtMQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCTkoxEzARBgNVBAcMCkJlZG1pbnN0ZXIxEjAQBgNV
-BAoMCU9wZW5FQ09NUDETMBEGA1UECwwKc2ltcGxlZGVtbzEqMCgGA1UEAwwhT3Bl
-bkVDT01QIHNpbXBsZWRlbW8gU2VydmVyIENBIFgxMScwJQYJKoZIhvcNAQkBFhhz
-aW1wbGVkZW1vQG9wZW5lY29tcC5vcmcwHhcNMTYxMTMwMTUzODM5WhcNMTcxMTMw
-MTUzODM5WjCBuTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5KMRMwEQYDVQQHDApC
-ZWRtaW5zdGVyMRIwEAYDVQQKDAlPcGVuRUNPTVAxEzARBgNVBAsMClNpbXBsZURl
-bW8xKTAnBgNVBAMMIGFhaS5hcGkuc2ltcGxlZGVtby5vcGVuZWNvbXAub3JnMTQw
-MgYJKoZIhvcNAQkBFiVhYWktaG9zdEBhcGkuc2ltcGxlZGVtby5vcGVuZWNvbXAu
-b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwQrQl8A0rT0Jjlos
-Mr/7LEhT5UOif4GGPOk+3NCIxT3lOqAbUf+d9ZXyT2jWFRiKWua03vQ+Dxc8c2h2
-RRuH8LwEiOiWqPjWRxNqsARzZMI3ryHFCFBZh0FcpjH9kEeKVlLDYuV68k+ZucKd
-NiqUNn61lD7kbmEGwvzKwf91FrJ09+CBMx1OnWKm3gCNKDqAEFMZCOdn2MgesJYB
-/03lzPBS1jDfBXImXRcTBzpgA+wdCLn0cIQ1eLWUwS5tUqUJNh36nHdVyJ0P2Yjd
-JLuxhFcmBKOz1ShyyO+BBtKBO8EGbU6qKflOiwOw0Fsn8LjKcrHQ58NPui5y04BU
-Rypf3QIDAQABo4GdMIGaMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgO4MB0G
-A1UdDgQWBBQyMUOsE2J+CKzK0qd8KFBD2gaWyjBbBgNVHSAEVDBSMFAGBFUdIAAw
-SDBGBggrBgEFBQcCAjA6GjhLZWVwIGF3YXkgZnJvbSBjaGlsZHJlbi4gIFRoaXMg
-Y2VydGlmaWNhdGUgaXMgbm90IGEgdG95LjANBgkqhkiG9w0BAQsFAAOCAQEAnkoy
-2tWJOyyyIQwtVojUxv1GWQPnw3WCUcKpuX4CJhHXLxNErW1fBg7bmo08BNmBPPpq
-WrJsy5lbBgUo9kgpViux5Stfy1rRIRsRLfl/icgCvJmUAxkmRCZL7yUvwG4K7s+8
-DwT+nW/XuWNP6Hd/qHccexB6COJ8KwvTdVoxAkCdX8qw4MCb/f7Kb1yle/vwBM5Q
-UUONCJ4bEns1vnb9DGlNDUJNwCfwORAaVJpVS38Mv4UnSTmb2KMePtCWcx/dNsYR
-2XrSGqLDnTvHwOpyhbfFTmackysGoSuDytORXy8YbwEiF13BwEK8i3rgNN0Z2ojf
-cpmE2xxmaa+A2uuN6g==
------END CERTIFICATE-----
-Bag Attributes
-    friendlyName: root
-    2.16.840.1.113894.746875.1.1: <Unsupported tag 6>
-subject=/C=US/ST=NJ/L=Bedminster/O=OpenECOMP/OU=simpledemo/CN=OpenECOMP simpledemo Server CA X1/emailAddress=simpledemo@openecomp.org
-issuer=/C=US/ST=NJ/L=Bedminster/O=OpenECOMP/OU=simpledemo/CN=OpenECOMP simpledemo Root Certification Authority/emailAddress=simpledemo@openecomp.org
------BEGIN CERTIFICATE-----
-MIIFpTCCA42gAwIBAgIJAJqx8dKnCZZoMA0GCSqGSIb3DQEBCwUAMIG9MQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCTkoxEzARBgNVBAcMCkJlZG1pbnN0ZXIxEjAQBgNV
-BAoMCU9wZW5FQ09NUDETMBEGA1UECwwKc2ltcGxlZGVtbzE6MDgGA1UEAwwxT3Bl
-bkVDT01QIHNpbXBsZWRlbW8gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEn
-MCUGCSqGSIb3DQEJARYYc2ltcGxlZGVtb0BvcGVuZWNvbXAub3JnMB4XDTE2MTEy
-ODIxMTQyNloXDTIxMTEyNzIxMTQyNlowga0xCzAJBgNVBAYTAlVTMQswCQYDVQQI
-DAJOSjETMBEGA1UEBwwKQmVkbWluc3RlcjESMBAGA1UECgwJT3BlbkVDT01QMRMw
-EQYDVQQLDApzaW1wbGVkZW1vMSowKAYDVQQDDCFPcGVuRUNPTVAgc2ltcGxlZGVt
-byBTZXJ2ZXIgQ0EgWDExJzAlBgkqhkiG9w0BCQEWGHNpbXBsZWRlbW9Ab3BlbmVj
-b21wLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALr4rivKQuRk
-YNf5Ig40e1nqj6s6LB1vgMOYbKfRziOFpPcUpsHPOhusHowiUsrU1vdFSzPz6Ej7
-PjlmNSg2Qka8YCn9kd6QgM7U0KcPJvIucBp+qjifH3EvP0jgDPhDeVRYxzV454dv
-5kQ9uCpswJP7YAnX51dkWeH8nwPUoagt31bOl9LXENSrgxEThxdLYMJnQJWk2CmV
-otXM4tT1dxyJxFUrZ6uJCEAYw5VtlplqihHf8lHy+sWQavtsLz/4dc+sGeXSTfoI
-voKvoh3uZ5gEhGV8yfJxk1veX5y5/AxP80vQ+smWYjTnQL5QQ57y4bciez4XVBmQ
-SWimWtOi4e8CAwEAAaOBtTCBsjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBhjAdBgNVHQ4EFgQUTqdsYgGNGubdJHq9tsaJhM9HE5wwcAYDVR0gBGkwZzBl
-BgRVHSAAMF0wWwYIKwYBBQUHAgIwTxpNSWYgeW91IHRydXN0IHRoaXMgY2VydCB0
-aGVuIHdlIGhhdmUgYSBicmlkZ2UgdGhhdCB5b3UgbWlnaHQgYmUgaW50ZXJlc3Rl
-ZCBpbi4wDQYJKoZIhvcNAQELBQADggIBAKNNlRqFuE/JgV1BHyYK0xoSXH4aZP/7
-IoHtDVcSaZAOOuFOUrwVMUbzRBebbb6RpFwt/X+NLFUGysd+XNLF7W7lzxKtmFNX
-n4OpNkBe0y5O7yurus8rERHzu3jiOSgVo+WzDlGpYSRnG3hI2qPWqD+Puzx/WwI8
-XUTuzEQQ3gUSyVFfXHpay3VpYmLZiLJ9WKY5SDw7Ie6Sxrju4Qm1HwnFY8wHZGcs
-2KMQzorJ1ZNQf523yUTghbT0rKaSFaD8zugPtI2ONfFG/QgrkQXo78opzPsHnHwa
-SxGSiAgeLbwAUCvPNl27zr6k6+7TcNjV0VUivAs0OG3VEAdgi7UWYB+30KfWwHwE
-zGmvd4IAGqIqlqLcSVArN5z8JK1B5nfjQn5UrclU1vK+dnuiKE2X4rKuBTRYRFR/
-km+mj4koYFPKFHndmJl1uv2OCJK9l5CSIuKWeI1qv8BASKqgNdoT/SKBXqxgYlCb
-o+j4IDjxrxChRO+e5vl9lA7INfRrbljCkUjfLRa+v2q9tWQ3+EQUwwnSrSfihh2T
-j0Tksr6b8dDsvMlCdOKG1B+JPcEXORSFKNXVTEfjqpJG8s16kFAocWt3S6xO0k1t
-qbQp+3tWQgW2TGnX0rMZzB6NGRNfWhlYmq2zHgXkiCIZ26Ztgt/LNbwEvN3+VlLo
-z/Rd+SKtlrfb
------END CERTIFICATE-----
diff --git a/test/csit/tests/aai/resources/api_suite/aai.key b/test/csit/tests/aai/resources/api_suite/aai.key
deleted file mode 100644
index 02724df46..000000000
--- a/test/csit/tests/aai/resources/api_suite/aai.key
+++ /dev/null
@@ -1,32 +0,0 @@
-Bag Attributes
-    friendlyName: aaiopenecomp
-    localKeyID: 54 69 6D 65 20 31 35 30 34 38 33 32 34 34 33 32 39 32 
-Key Attributes: <No Attributes>
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDBCtCXwDStPQmO
-Wiwyv/ssSFPlQ6J/gYY86T7c0IjFPeU6oBtR/531lfJPaNYVGIpa5rTe9D4PFzxz
-aHZFG4fwvASI6Jao+NZHE2qwBHNkwjevIcUIUFmHQVymMf2QR4pWUsNi5XryT5m5
-wp02KpQ2frWUPuRuYQbC/MrB/3UWsnT34IEzHU6dYqbeAI0oOoAQUxkI52fYyB6w
-lgH/TeXM8FLWMN8FciZdFxMHOmAD7B0IufRwhDV4tZTBLm1SpQk2Hfqcd1XInQ/Z
-iN0ku7GEVyYEo7PVKHLI74EG0oE7wQZtTqop+U6LA7DQWyfwuMpysdDnw0+6LnLT
-gFRHKl/dAgMBAAECggEBAJko2HkeIW01mUhdWOXnFgR7WjzzXZEmlffr41lVBr7f
-rejGsQZs9cms73R7rCdOsi8PDoA6bqaQfADg571K659fvYVWbHqh+3im+iWvUlKm
-GYIVG/vNrEq43CZsUU7Qw/xba/QiOFraNxCATTV1sORPwgddouXEi5XW9ZPX9/FJ
-wORx4L/K0DfHX1rr+rtOoHCJdZYhn3Ij87kmR8Mwg0fNeWhHqtxUEyM/itRjCvOe
-mgt2V8DORhmq12L4+5QJctBrkBVRp9Rh6YSZZBGnKbTSgf4q648BdkJDLSK4cguT
-D6BAw3gxj5V4wt5W0wn2JpjadFwnixrTzvMP/yAqfK0CgYEA93nBAoUPw8nzQkwk
-8iWBjfJ999Rw92hnnvk3xbcQcGfgUYuB4dxwe6FQTmFIVylt81er1YUvMb3ao7fo
-5ZcGnI5p1idjsd27kbZJLxb5Oh919hKu5IfkfYsVgnC0UdKCTgH5CaH0U4ATuXwt
-RL6qm0XcLALs5y2OO6z3s+mYhisCgYEAx7EQ8MA45bkXnRQiHBhGcIIcr2sRDfVJ
-OhHmGxx3EcYgtsIYKTqtQOyIt/nQxo6iyNL9bzfzBTybFJLuj63ZG1Ef4LosJedl
-eAU2NsKv5MlKYDSdNbLAJ0Op9I2Xu/pXQecPwY/3MkIQArdQCLevMLEGywCsuJTn
-BjkJNDkb9hcCgYAhoFiaiAwJVYKJSqFmibQd3opBR4uGApi54DE021gPff3b9rHS
-R8q88cFgtRVISqfW/d2qaKtt/dcckdvCfo/2a99zqux/+ZoIBZXSITQCMs4rfoRn
-JxPj/ycQD1JhH9J22QvGxEvXoLqNZJMeGS5DZO2yyT75dpYyA6Gwv5fq+wKBgQC5
-AhV917lfLELyZurLOLpaFlHZO8rLMcusH1UfHRo7v2IjsGOOHyzRD9QDD1IcA55R
-jRj8Z8uhuGq9fvvC5gBVTK3KGPI6E85wifOWfH1V7CAaTeSxEXDxb8EQL/a6U89v
-4VE5tdYCHC6VNZzS1staw0hV38QmJt57Z3Bdj+OV9QKBgE/b9fxpo+SVQ37BzNNY
-SEKTTijaddz8fdomApg6a2eFJL93Ej/op7N7gnHtPWMivPnRRza9ZjfnG+aZ7n2J
-sWyBiZK9xliS2TsF3l3q9Z0Vaq3i1nOlV7Bd20ZS8KjQjDtKnIRfLkQDkvmXbU5L
-emwkdsQZbpPFJch3mCGtI7JW
------END PRIVATE KEY-----
diff --git a/test/csit/tests/aai/resources/api_suite/complex.robot b/test/csit/tests/aai/resources/api_suite/complex.robot
deleted file mode 100644
index 3602f731a..000000000
--- a/test/csit/tests/aai/resources/api_suite/complex.robot
+++ /dev/null
@@ -1,72 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       requests
-Library       Collections
-
-*** Variables ***
-${COMPLEXKEYVALUE}  complex-integration-test1
-${COMPLEXURL}  https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes/complex/${COMPLEXKEYVALUE}
-${COMPLEXDATA}  {"physical-location-id":"${COMPLEXKEYVALUE}","data-center-code":"example-data-center-code-val-77883","complex-name":"example-complex-name-val-12992","identity-url":"example-identity-url-val-74366","physical-location-type":"example-physical-location-type-val-32854","street1":"example-street1-val-26496","street2":"example-street2-val-6629","city":"example-city-val-30262","state":"example-state-val-9058","postal-code":"example-postal-code-val-44893","country":"example-country-val-98673","region":"example-region-val-10014","latitude":"example-latitude-val-47555","longitude":"example-longitude-val-76903","elevation":"example-elevation-val-63385","lata":"example-lata-val-90935"}
-
-*** Test Cases ***
-
-Run AAI Put complex
-    [Documentation]             Create an complex object
-    ${resp}=                    PutWithCert              ${COMPLEXURL}              ${COMPLEXDATA}
-    log                         ${COMPLEXURL}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201
-
-Run AAI Get complex
-    [Documentation]             Get the complex object just created
-    ${resp}                     GetWithCert              ${COMPLEXURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete complex
-    [Documentation]             Delete the complex just created
-    ${resp}=                    DeleteWithCert           ${COMPLEXURL}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204
-
-*** Keywords ***
-PutWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-	
-PatchWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/merge-patch+json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.patch('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}	
-
-PostWithCert
-    [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-GetWithCert
-    [Arguments]      ${url}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-DeleteWithCert
-    [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
\ No newline at end of file
diff --git a/test/csit/tests/aai/resources/api_suite/ems.robot b/test/csit/tests/aai/resources/api_suite/ems.robot
deleted file mode 100644
index 0068be35d..000000000
--- a/test/csit/tests/aai/resources/api_suite/ems.robot
+++ /dev/null
@@ -1,65 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       requests
-Library       Collections
-
-*** Variables ***
-${TARGETURL}  https://${HOST_IP}:8443/aai/v11/external-system/esr-ems-list/esr-ems/ems-test1
-${EMSDATA}  { "ems-id": "ems-test1", "esr-system-info-list": { "esr-system-info": [{ "esr-system-info-id": "ems-esr-system-info1", "system-name": "fff", "type": "ftp", "vendor": "ZTE", "version": "v1.0", "user-name": "root", "password": "123456", "system-type": "EMS_PERFORMANCE", "ip-address": "10.74.15.28", "port": "6767", "passive": true, "remote-path": "/data/peroformance"},{ "esr-system-info-id": "ems-esr-system-info2", "system-name": "fff", "type": "ftp", "vendor": "ZTE", "version": "v1.0", "user-name": "root", "password": "123456", "system-type": "EMS_RESOUCE", "ip-address": "10.74.15.29", "port": "6666", "passive": true, "remote-path": "/opt/Gcp/data/"},{ "esr-system-info-id": "ems-esr-system-info3", "system-name": "fff", "vendor": "ZTE", "version": "v1.0", "user-name": "root", "password": "123456", "system-type": "EMS_ALARM", "ip-address": "10.74.15.30", "port": "2000"}]}}
-
-*** Test Cases ***
-
-Run AAI Put ems
-    [Documentation]             Create an ems object
-    ${resp}=                    PutWithCert              ${TARGETURL}              ${EMSDATA}
-    log                         ${TARGETURL}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201
-
-Run AAI Get ems
-    [Documentation]             Get the ems object just created
-    ${resp}                     GetWithCert              ${TARGETURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete ems
-    [Documentation]             Delete the ems just created
-    ${resp}=                    DeleteWithCert           ${TARGETURL}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204
-
-*** Keywords ***
-PutWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-PostWithCert
-    [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-GetWithCert
-    [Arguments]      ${url}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-DeleteWithCert
-    [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-    
diff --git a/test/csit/tests/aai/resources/api_suite/get_all.robot b/test/csit/tests/aai/resources/api_suite/get_all.robot
deleted file mode 100644
index 8e464cbdb..000000000
--- a/test/csit/tests/aai/resources/api_suite/get_all.robot
+++ /dev/null
@@ -1,105 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       requests
-Library       Collections
-
-*** Variables ***
-${COMPLEXKEYVALUE1}  complex-integration-test3-1
-${COMPLEXKEYVALUE2}  complex-integration-test3-2
-${COMPLEXURL1}       https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes/complex/${COMPLEXKEYVALUE1}
-${COMPLEXURL2}       https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes/complex/${COMPLEXKEYVALUE2}
-${ALLCOMPLEXURL}     https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes
-${COMPLEXDATA1}  {"physical-location-id":"${COMPLEXKEYVALUE1}","data-center-code":"example-data-center-code-val-77883","complex-name":"example-complex-name-val-12992","identity-url":"example-identity-url-val-74366","physical-location-type":"example-physical-location-type-val-32854","street1":"example-street1-val-26496","street2":"example-street2-val-6629","city":"example-city-val-30262","state":"example-state-val-9058","postal-code":"example-postal-code-val-44893","country":"example-country-val-98673","region":"example-region-val-10014","latitude":"example-latitude-val-47555","longitude":"example-longitude-val-76903","elevation":"example-elevation-val-63385","lata":"example-lata-val-90935"}
-${COMPLEXDATA2}  {"physical-location-id":"${COMPLEXKEYVALUE2}","data-center-code":"example-data-center-code-val-7783","complex-name":"example-complex-name-val-1292","identity-url":"example-identity-url-val-7466","physical-location-type":"example-physical-location-type-val-3854","street1":"example-street1-val-2496","street2":"example-street2-val-6629","city":"example-city-val-3062","state":"example-state-val-9058","postal-code":"example-postal-code-val-4493","country":"example-country-val-9873","region":"example-region-val-1004","latitude":"example-latitude-val-4555","longitude":"example-longitude-val-7603","elevation":"example-elevation-val-6335","lata":"example-lata-val-9035"}
-
-*** Test Cases ***
-
-Run AAI Put complex 1
-    [Documentation]             Create an complex 1 object
-    ${resp}=                    PutWithCert              ${COMPLEXURL1}              ${COMPLEXDATA1}
-    log                         ${COMPLEXURL1}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201
-	
-Run AAI Put complex 2
-    [Documentation]             Create an complex 2 object
-    ${resp}=                    PutWithCert              ${COMPLEXURL2}              ${COMPLEXDATA2}
-    log                         ${COMPLEXURL2}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201	
-
-Run AAI Get all complex
-    [Documentation]             Get the complex object just created
-    ${resp}                     GetWithCert              ${ALLCOMPLEXURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200	
-	
-Run AAI Get complex 1 to delete
-    [Documentation]             Get the complex 1 object to delete
-    ${resp}                     GetWithCert              ${COMPLEXURL1}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete complex 1
-    [Documentation]             Delete the complex just created
-    ${resp}=                    DeleteWithCert           ${COMPLEXURL1}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204
-	
-Run AAI Get complex 2 to delete
-    [Documentation]             Get the complex 2 object to delete
-    ${resp}                     GetWithCert              ${COMPLEXURL2}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete complex 2
-    [Documentation]             Delete the complex just created
-    ${resp}=                    DeleteWithCert           ${COMPLEXURL2}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204	
-
-*** Keywords ***
-PutWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-	
-PatchWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/merge-patch+json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.patch('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}	
-
-PostWithCert
-    [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-GetWithCert
-    [Arguments]      ${url}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-DeleteWithCert
-    [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
\ No newline at end of file
diff --git a/test/csit/tests/aai/resources/api_suite/get_with_depth.robot b/test/csit/tests/aai/resources/api_suite/get_with_depth.robot
deleted file mode 100644
index 8e464cbdb..000000000
--- a/test/csit/tests/aai/resources/api_suite/get_with_depth.robot
+++ /dev/null
@@ -1,105 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       requests
-Library       Collections
-
-*** Variables ***
-${COMPLEXKEYVALUE1}  complex-integration-test3-1
-${COMPLEXKEYVALUE2}  complex-integration-test3-2
-${COMPLEXURL1}       https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes/complex/${COMPLEXKEYVALUE1}
-${COMPLEXURL2}       https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes/complex/${COMPLEXKEYVALUE2}
-${ALLCOMPLEXURL}     https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes
-${COMPLEXDATA1}  {"physical-location-id":"${COMPLEXKEYVALUE1}","data-center-code":"example-data-center-code-val-77883","complex-name":"example-complex-name-val-12992","identity-url":"example-identity-url-val-74366","physical-location-type":"example-physical-location-type-val-32854","street1":"example-street1-val-26496","street2":"example-street2-val-6629","city":"example-city-val-30262","state":"example-state-val-9058","postal-code":"example-postal-code-val-44893","country":"example-country-val-98673","region":"example-region-val-10014","latitude":"example-latitude-val-47555","longitude":"example-longitude-val-76903","elevation":"example-elevation-val-63385","lata":"example-lata-val-90935"}
-${COMPLEXDATA2}  {"physical-location-id":"${COMPLEXKEYVALUE2}","data-center-code":"example-data-center-code-val-7783","complex-name":"example-complex-name-val-1292","identity-url":"example-identity-url-val-7466","physical-location-type":"example-physical-location-type-val-3854","street1":"example-street1-val-2496","street2":"example-street2-val-6629","city":"example-city-val-3062","state":"example-state-val-9058","postal-code":"example-postal-code-val-4493","country":"example-country-val-9873","region":"example-region-val-1004","latitude":"example-latitude-val-4555","longitude":"example-longitude-val-7603","elevation":"example-elevation-val-6335","lata":"example-lata-val-9035"}
-
-*** Test Cases ***
-
-Run AAI Put complex 1
-    [Documentation]             Create an complex 1 object
-    ${resp}=                    PutWithCert              ${COMPLEXURL1}              ${COMPLEXDATA1}
-    log                         ${COMPLEXURL1}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201
-	
-Run AAI Put complex 2
-    [Documentation]             Create an complex 2 object
-    ${resp}=                    PutWithCert              ${COMPLEXURL2}              ${COMPLEXDATA2}
-    log                         ${COMPLEXURL2}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201	
-
-Run AAI Get all complex
-    [Documentation]             Get the complex object just created
-    ${resp}                     GetWithCert              ${ALLCOMPLEXURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200	
-	
-Run AAI Get complex 1 to delete
-    [Documentation]             Get the complex 1 object to delete
-    ${resp}                     GetWithCert              ${COMPLEXURL1}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete complex 1
-    [Documentation]             Delete the complex just created
-    ${resp}=                    DeleteWithCert           ${COMPLEXURL1}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204
-	
-Run AAI Get complex 2 to delete
-    [Documentation]             Get the complex 2 object to delete
-    ${resp}                     GetWithCert              ${COMPLEXURL2}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete complex 2
-    [Documentation]             Delete the complex just created
-    ${resp}=                    DeleteWithCert           ${COMPLEXURL2}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204	
-
-*** Keywords ***
-PutWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-	
-PatchWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/merge-patch+json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.patch('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}	
-
-PostWithCert
-    [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-GetWithCert
-    [Arguments]      ${url}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-DeleteWithCert
-    [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
\ No newline at end of file
diff --git a/test/csit/tests/aai/resources/api_suite/patch.robot b/test/csit/tests/aai/resources/api_suite/patch.robot
deleted file mode 100644
index 90544e4d9..000000000
--- a/test/csit/tests/aai/resources/api_suite/patch.robot
+++ /dev/null
@@ -1,86 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       requests
-Library       Collections
-
-*** Variables ***
-${L3NETWORKKEYVALUE}   l3-network-integration-test1
-${L3NETWORKURL}        https://${HOST_IP}:8443/aai/v11/network/l3-networks/l3-network/${L3NETWORKKEYVALUE}
-${L3NETWORKDATA}  {"network-id":"${L3NETWORKKEYVALUE}","network-name":"example-network-name-val-5468","network-type":"example-network-type-val-5468","network-role":"example-network-role-val-5468","network-technology":"example-network-technology-val-5468","neutron-network-id":"example-neutron-network-id-val-5468","is-bound-to-vpn":"true","service-id":"example-service-id-val-5468","orchestration-status":"example-orchestration-status-val-5468","heat-stack-id":"example-heat-stack-id-val-5468","mso-catalog-key":"example-mso-catalog-key-val-5468"}
-${L3NETWORKPATCHDATA}  {"network-id":"${L3NETWORKKEYVALUE}","network-name":"example-network-name-val-5468-patched","network-type":"example-network-type-val-5468-patched"}
-
-*** Test Cases ***
-Run AAI Put l3-network
-    [Documentation]             Create l3-network object
-    ${resp}=                    PutWithCert              ${L3NETWORKURL}              ${L3NETWORKDATA}
-    log                         ${L3NETWORKURL}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201
-
-Run AAI Get l3-network
-    [Documentation]             Get the l3-network object just created
-    ${resp}                     GetWithCert              ${L3NETWORKURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-	
-Run AAI Patch l3-network
-    [Documentation]             Update (Parch) l3-network object
-    ${resp}=                    PatchWithCert              ${L3NETWORKURL}              ${L3NETWORKPATCHDATA}
-    log                         ${L3NETWORKURL}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      200	
-	
-Run AAI Get l3-network
-    [Documentation]             Get the l3-network object just patched
-    ${resp}                     GetWithCert              ${L3NETWORKURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete l3-network
-    [Documentation]             Delete the l3-network
-    ${resp}=                    DeleteWithCert           ${L3NETWORKURL}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204	
-	
-*** Keywords ***
-PutWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-	
-PatchWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/merge-patch+json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.patch('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}	
-
-PostWithCert
-    [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-GetWithCert
-    [Arguments]      ${url}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-DeleteWithCert
-    [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
\ No newline at end of file
diff --git a/test/csit/tests/aai/resources/api_suite/pserver.robot b/test/csit/tests/aai/resources/api_suite/pserver.robot
deleted file mode 100644
index 55e57bccb..000000000
--- a/test/csit/tests/aai/resources/api_suite/pserver.robot
+++ /dev/null
@@ -1,65 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       requests
-Library       Collections
-
-*** Variables ***
-${TARGETURL}  https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/pservers/pserver/pserver-test1
-${PSERVERDATA}  {"hostname": "pserver-test1"}
-
-*** Test Cases ***
-
-Run AAI Put Pserver
-    [Documentation]             Create an pserver object
-    ${resp}=                    PutWithCert              ${TARGETURL}              ${PSERVERDATA}
-    log                         ${TARGETURL}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201
-
-Run AAI Get Pserver
-    [Documentation]             Get the pserver object just created
-    ${resp}                     GetWithCert              ${TARGETURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete Pserver
-    [Documentation]             Delete the pserver just created
-    ${resp}=                    DeleteWithCert           ${TARGETURL}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204
-
-*** Keywords ***
-PutWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-PostWithCert
-    [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-GetWithCert
-    [Arguments]      ${url}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-DeleteWithCert
-    [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-    
diff --git a/test/csit/tests/aai/resources/api_suite/thirdparty_sdnc.robot b/test/csit/tests/aai/resources/api_suite/thirdparty_sdnc.robot
deleted file mode 100644
index bc27cafa8..000000000
--- a/test/csit/tests/aai/resources/api_suite/thirdparty_sdnc.robot
+++ /dev/null
@@ -1,65 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       requests
-Library       Collections
-
-*** Variables ***
-${TARGETURL}  https://${HOST_IP}:8443/aai/v11/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/thirdparty-sdnc-test1
-${SDNCDATA}  {"thirdparty-sdnc-id": "thirdparty-sdnc-test1", "location": "edge", "product-name": "aaa", "esr-system-info-list": { "esr-system-info": [{ "esr-system-info-id": "thirdparty-sdnc-esr-system-info-id", "system-name": "sdnc1", "type": "WAN", "vendor": "ZTE", "version": "v1.0", "service-url": "http://10.74.66.12:80", "user-name": "admin", "password": "admin", "system-type": "thirdparty_SDNC", "protocol": "netconf"}]}}
-
-*** Test Cases ***
-
-Run AAI Put thirdparty-sdnc
-    [Documentation]             Create an thirdparty-sdnc object
-    ${resp}=                    PutWithCert              ${TARGETURL}              ${SDNCDATA}
-    log                         ${TARGETURL}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201
-
-Run AAI Get thirdparty-sdnc
-    [Documentation]             Get the thirdparty-sdnc object just created
-    ${resp}                     GetWithCert              ${TARGETURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete thirdparty-sdnc
-    [Documentation]             Delete the thirdparty-sdnc just created
-    ${resp}=                    DeleteWithCert           ${TARGETURL}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204
-
-*** Keywords ***
-PutWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-PostWithCert
-    [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-GetWithCert
-    [Arguments]      ${url}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-DeleteWithCert
-    [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-    
diff --git a/test/csit/tests/aai/resources/api_suite/vim.robot b/test/csit/tests/aai/resources/api_suite/vim.robot
deleted file mode 100644
index 9a7fc1f93..000000000
--- a/test/csit/tests/aai/resources/api_suite/vim.robot
+++ /dev/null
@@ -1,65 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       requests
-Library       Collections
-
-*** Variables ***
-${TARGETURL}  https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/VIM-test1/RegionOne1
-${VIMDATA}  {"cloud-owner": "VIM-test1", "cloud-region-id": "RegionOne1", "cloud-type": "openstack", "owner-defined-type": "owner-defined-type", "cloud-region-version": "v1.0", "cloud-zone": "cloud zone", "complex-name": "complex name", "cloud-extra-info": "{}", "esr-system-info-list": { "esr-system-info": [{"esr-system-info-id": "vim-esr-system-info-id", "service-url": "http://10.12.25.2:5000/v3", "user-name": "demo", "password": "onapdemo", "system-type": "VIM", "ssl-insecure": true, "cloud-domain": "Default"}]}}
-
-*** Test Cases ***
-
-Run AAI Put VIM
-    [Documentation]             Create an VIM object
-    ${resp}=                    PutWithCert              ${TARGETURL}              ${VIMDATA}
-    log                         ${TARGETURL}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201
-
-Run AAI Get VIM
-    [Documentation]             Get the VIM object just created
-    ${resp}                     GetWithCert              ${TARGETURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete VIM
-    [Documentation]             Delete the VIM just created
-    ${resp}=                    DeleteWithCert           ${TARGETURL}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204
-
-*** Keywords ***
-PutWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-PostWithCert
-    [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-GetWithCert
-    [Arguments]      ${url}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-DeleteWithCert
-    [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-    
diff --git a/test/csit/tests/aai/resources/api_suite/vnfm.robot b/test/csit/tests/aai/resources/api_suite/vnfm.robot
deleted file mode 100644
index 13b0adf40..000000000
--- a/test/csit/tests/aai/resources/api_suite/vnfm.robot
+++ /dev/null
@@ -1,65 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-Library       requests
-Library       Collections
-
-*** Variables ***
-${TARGETURL}  https://${HOST_IP}:8443/aai/v11/external-system/esr-vnfm-list/esr-vnfm/vnfm-test1
-${VNFMDATA}  {"vnfm-id": "vnfm-test1", "vim-id": "123", "certificate-url": "", "esr-system-info-list": {"esr-system-info": [{"esr-system-info-id":"esr-system-info-vnfm-test1", "system-name": "vnfmtest1", "type": "Tacker", "vendor": "ZTE", "version": "v1.0", "service-url": "http://10.74.44.12", "user-name": "admin", "password": "admin", "system-type": "VNFM"}]}}
-
-*** Test Cases ***
-
-Run AAI Put vnfm
-    [Documentation]             Create an vnfm object
-    ${resp}=                    PutWithCert              ${TARGETURL}              ${VNFMDATA}
-    log                         ${TARGETURL}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      201
-
-Run AAI Get vnfm
-    [Documentation]             Get the vnfm object just created
-    ${resp}                     GetWithCert              ${TARGETURL}
-    log                         ${resp}
-    log                         ${resp.json()}
-    Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
-    Set Global Variable			${resource_version}
-
-Run AAI Delete vnfm
-    [Documentation]             Delete the vnfm just created
-    ${resp}=                    DeleteWithCert           ${TARGETURL}?resource-version=${resource_version}
-    log                         ${resp.text}
-    Should Be Equal As Strings  ${resp.status_code}      204
-
-*** Keywords ***
-PutWithCert
-    [Arguments]      ${url}      ${data}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-PostWithCert
-    [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-GetWithCert
-    [Arguments]      ${url}
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-
-DeleteWithCert
-    [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
-    ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
-    [return]         ${resp}
-