aboutsummaryrefslogtreecommitdiffstats
path: root/test/csit/tests/aai
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-27 10:29:30 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-09-27 12:50:28 -0700
commit2d3d8dcf6ef1bd2a161c69d561c629c5ec3f59c4 (patch)
tree652fd47a183c291e96c6721f550a5f63464f6e66 /test/csit/tests/aai
parente161173e279a73134dda4c2f429605d6c9ee1fe7 (diff)
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>
Diffstat (limited to 'test/csit/tests/aai')
-rw-r--r--test/csit/tests/aai/esr-server/startup/__init__.robot2
-rw-r--r--test/csit/tests/aai/esr-server/startup/test1.robot15
-rw-r--r--test/csit/tests/aai/resources/api_suite/__init__.robot2
-rw-r--r--test/csit/tests/aai/resources/api_suite/aai.crt70
-rw-r--r--test/csit/tests/aai/resources/api_suite/aai.key32
-rw-r--r--test/csit/tests/aai/resources/api_suite/complex.robot72
-rw-r--r--test/csit/tests/aai/resources/api_suite/ems.robot65
-rw-r--r--test/csit/tests/aai/resources/api_suite/get_all.robot105
-rw-r--r--test/csit/tests/aai/resources/api_suite/get_with_depth.robot105
-rw-r--r--test/csit/tests/aai/resources/api_suite/patch.robot86
-rw-r--r--test/csit/tests/aai/resources/api_suite/pserver.robot65
-rw-r--r--test/csit/tests/aai/resources/api_suite/thirdparty_sdnc.robot65
-rw-r--r--test/csit/tests/aai/resources/api_suite/vim.robot65
-rw-r--r--test/csit/tests/aai/resources/api_suite/vnfm.robot65
-rw-r--r--test/csit/tests/aai/resources/db_edge_rule/__init__.robot2
-rw-r--r--test/csit/tests/aai/resources/db_edge_rule/aai.crt70
-rw-r--r--test/csit/tests/aai/resources/db_edge_rule/aai.key32
-rw-r--r--test/csit/tests/aai/resources/db_edge_rule/delete_other_v.robot95
-rw-r--r--test/csit/tests/aai/resources/db_edge_rule/edge_multiplicity_one_2_one.robot224
-rw-r--r--test/csit/tests/aai/resources/db_edge_rule/prevent_delete.robot131
-rw-r--r--test/csit/tests/aai/resources/error_handling_suite/__init__.robot2
-rw-r--r--test/csit/tests/aai/resources/error_handling_suite/aai.crt70
-rw-r--r--test/csit/tests/aai/resources/error_handling_suite/aai.key32
-rw-r--r--test/csit/tests/aai/resources/error_handling_suite/error_403.robot47
-rw-r--r--test/csit/tests/aai/resources/error_handling_suite/error_412_404.robot78
-rw-r--r--test/csit/tests/aai/resources/relationship_suite/__init__.robot2
-rw-r--r--test/csit/tests/aai/resources/relationship_suite/aai.crt70
-rw-r--r--test/csit/tests/aai/resources/relationship_suite/aai.key32
-rw-r--r--test/csit/tests/aai/resources/relationship_suite/complex_l3_network.robot110
-rw-r--r--test/csit/tests/aai/resources/relationship_suite/pserver_complex_rel_api.robot119
-rw-r--r--test/csit/tests/aai/resources/relationship_suite/relationship_using_related_link.robot110
-rw-r--r--test/csit/tests/aai/search-data-service/suite1/__init__.robot2
-rw-r--r--test/csit/tests/aai/search-data-service/suite1/private.key27
-rw-r--r--test/csit/tests/aai/search-data-service/suite1/publickey.crt25
-rw-r--r--test/csit/tests/aai/search-data-service/suite1/test1.robot59
-rw-r--r--test/csit/tests/aai/traversal/suite1/__init__.robot2
-rw-r--r--test/csit/tests/aai/traversal/suite1/aai.crt70
-rw-r--r--test/csit/tests/aai/traversal/suite1/aai.key32
-rw-r--r--test/csit/tests/aai/traversal/suite1/custom_query_1.robot131
-rw-r--r--test/csit/tests/aai/traversal/suite1/custom_query_all_formats.robot190
40 files changed, 0 insertions, 2578 deletions
diff --git a/test/csit/tests/aai/esr-server/startup/__init__.robot b/test/csit/tests/aai/esr-server/startup/__init__.robot
deleted file mode 100644
index c1eddc936..000000000
--- a/test/csit/tests/aai/esr-server/startup/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation AAI ESR SERVER - Startup
diff --git a/test/csit/tests/aai/esr-server/startup/test1.robot b/test/csit/tests/aai/esr-server/startup/test1.robot
deleted file mode 100644
index d1504a1b4..000000000
--- a/test/csit/tests/aai/esr-server/startup/test1.robot
+++ /dev/null
@@ -1,15 +0,0 @@
-*** Settings ***
-Library RequestsLibrary
-
-*** Test Cases ***
-Liveness Test
- [Documentation] Check various endpoints for basic liveness check
- Create Session esr-server https://${ESRSERVER_IP}:9518
- CheckUrl esr-server /api/aai-esr-server/v1/test
-
-*** Keywords ***
-CheckUrl
- [Arguments] ${session} ${path}
- ${resp}= Get Request ${session} ${path}
- Should Be Equal As Integers ${resp.status_code} 200
-
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}
-
diff --git a/test/csit/tests/aai/resources/db_edge_rule/__init__.robot b/test/csit/tests/aai/resources/db_edge_rule/__init__.robot
deleted file mode 100644
index 538def841..000000000
--- a/test/csit/tests/aai/resources/db_edge_rule/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation Resources - Pserver Suite
diff --git a/test/csit/tests/aai/resources/db_edge_rule/aai.crt b/test/csit/tests/aai/resources/db_edge_rule/aai.crt
deleted file mode 100644
index 6a28bbb8c..000000000
--- a/test/csit/tests/aai/resources/db_edge_rule/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/db_edge_rule/aai.key b/test/csit/tests/aai/resources/db_edge_rule/aai.key
deleted file mode 100644
index 02724df46..000000000
--- a/test/csit/tests/aai/resources/db_edge_rule/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/db_edge_rule/delete_other_v.robot b/test/csit/tests/aai/resources/db_edge_rule/delete_other_v.robot
deleted file mode 100644
index d7da7ab84..000000000
--- a/test/csit/tests/aai/resources/db_edge_rule/delete_other_v.robot
+++ /dev/null
@@ -1,95 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${CUSTOMERKEYVALUE} customer-integration-test3
-${LOGICALLINKKEYVALUE} logical-link-integration-test3
-${CUSTOMERURL} https://${HOST_IP}:8443/aai/v11/business/customers/customer/${CUSTOMERKEYVALUE}
-${LOGICALLINKURL} https://${HOST_IP}:8443/aai/v11/network/logical-links/logical-link/${LOGICALLINKKEYVALUE}
-${CUSTOMERDATA} {"global-customer-id":"${CUSTOMERKEYVALUE}","subscriber-name":"subscriber-name-integration-test","subscriber-type":"subscriber-type-integration-test","service-subscriptions":{"service-subscription":{"service-type":"service-type-987654321-04","service-instances":{"service-instance":{"service-instance-id":"service-instance-id-integration-test","relationship-list":{"relationship":[{"related-to":"logical-link","relationship-data":[{"relationship-key":"logical-link.link-name","relationship-value":"${LOGICALLINKKEYVALUE}"}]}]}}}}}}
-${LOGICALLINKDATA} {"link-name":"${LOGICALLINKKEYVALUE}","link-type":"example-link-type-value-val-126","speed-value":"example-speed-value-val-126","speed-units":"example-speed-units-val-126","ip-version":"example-ip-version-val-126","routing-protocol":"example-routing-protocol-val-126","resource-model-uuid":"example-resource-model-uuid-val-5465"}
-
-*** Test Cases ***
-Run AAI Put logical-link
- [Documentation] Create an logical-link object
- ${resp}= PutWithCert ${LOGICALLINKURL} ${LOGICALLINKDATA}
- log ${LOGICALLINKURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Get logical-link
- [Documentation] Get the logical-link object just created
- ${resp} GetWithCert ${LOGICALLINKURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put customer rel with logical-link
- [Documentation] Create customer rel with logical-link
- ${resp}= PutWithCert ${CUSTOMERURL} ${CUSTOMERDATA}
- log ${CUSTOMERURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Get customer to delete
- [Documentation] Get the customer
- ${resp} GetWithCert ${CUSTOMERURL}
- 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 customer
- [Documentation] Delete the customer
- ${resp}= DeleteWithCert ${CUSTOMERURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get logical-link should not found error 404
- [Documentation] Get logical-link should not found error 404
- ${resp} GetWithCert ${LOGICALLINKURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 404
-
-*** 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/db_edge_rule/edge_multiplicity_one_2_one.robot b/test/csit/tests/aai/resources/db_edge_rule/edge_multiplicity_one_2_one.robot
deleted file mode 100644
index bb0a2a406..000000000
--- a/test/csit/tests/aai/resources/db_edge_rule/edge_multiplicity_one_2_one.robot
+++ /dev/null
@@ -1,224 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${CRKEYVALUE1} cr-integration-test1
-${CRKEYVALUE2} cr-integration-test2
-${TENANTKEYVALUE} tenant-integration-test1
-${VSERVERKEYVALUE1} vserver-integration-test1
-${VSERVERKEYVALUE2} vserver-integration-test2
-${SNAPSHOTKEYVALUE1} snapshot-integration-test1
-${SNAPSHOTKEYVALUE2} snapshot-integration-test2
-
-${CRURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE1}/${CRKEYVALUE2}
-${TENANTURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE1}/${CRKEYVALUE2}/tenants/tenant/${TENANTKEYVALUE}
-${VSERVERURL1} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE1}/${CRKEYVALUE2}/tenants/tenant/${TENANTKEYVALUE}/vservers/vserver/${VSERVERKEYVALUE1}
-${VSERVERURL2} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE1}/${CRKEYVALUE2}/tenants/tenant/${TENANTKEYVALUE}/vservers/vserver/${VSERVERKEYVALUE2}
-${SNAPSHOTURL1} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE1}/${CRKEYVALUE2}/snapshots/snapshot/${SNAPSHOTKEYVALUE1}
-${SNAPSHOTURL2} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE1}/${CRKEYVALUE2}/snapshots/snapshot/${SNAPSHOTKEYVALUE2}
-${RELATIONSHIPURL1} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE1}/${CRKEYVALUE2}/tenants/tenant/${TENANTKEYVALUE}/vservers/vserver/${VSERVERKEYVALUE1}/relationship-list/relationship
-${RELATIONSHIPURL2} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE1}/${CRKEYVALUE2}/snapshots/snapshot/${SNAPSHOTKEYVALUE1}/relationship-list/relationship
-${CRDATA} {"cloud-owner":"${CRKEYVALUE1}","cloud-region-id":"${CRKEYVALUE2}","owner-defined-type":"example-owner-defined-type-987654321-09","cloud-region-version":"example-cloud-region-version-987654321-09","identity-url":"example-identity-url-987654321-09","cloud-zone":"example-cloud-zone-987654321-09","complex-name":"example-complex-name-987654321-09"}
-${TENANTDATA} {"tenant-id":"${TENANTKEYVALUE}","tenant-name":"tenant-name-0999"}
-${VSERVERDATA1} {"vserver-id":"${VSERVERKEYVALUE1}","vserver-name":"example-vserver-name-val-7367","vserver-name2":"example-vserver-name2-val-7367","prov-status":"example-prov-status-val-7367","vserver-selflink":"example-vserver-selflink-val-7367"}
-${VSERVERDATA2} {"vserver-id":"${VSERVERKEYVALUE2}","vserver-name":"example-vserver-name-val-73678","vserver-name2":"example-vserver-name2-val-73867","prov-status":"example-prov-status-val-73867","vserver-selflink":"example-vserver-selflink-val-73687"}
-${SNAPSHOTDATA1} {"snapshot-id":"${SNAPSHOTKEYVALUE1}"}
-${SNAPSHOTDATA2} {"snapshot-id":"${SNAPSHOTKEYVALUE2}"}
-${RELATIONSHIPDATA1} {"related-to":"snapshot","relationship-data":[{"relationship-key":"snapshot.snapshot-id","relationship-value":"${SNAPSHOTKEYVALUE1}"},{"relationship-key":"cloud-region.cloud-owner","relationship-value":"${CRKEYVALUE1}"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"${CRKEYVALUE2}"}]}
-${RELATIONSHIPDATA2} {"related-to":"snapshot","relationship-data":[{"relationship-key":"snapshot.snapshot-id","relationship-value":"${SNAPSHOTKEYVALUE2}"},{"relationship-key":"cloud-region.cloud-owner","relationship-value":"${CRKEYVALUE1}"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"${CRKEYVALUE2}"}]}
-${RELATIONSHIPDATA3} {"related-to":"vserver","relationship-data":[{"relationship-key":"vserver.vserver-id","relationship-value":"${VSERVERKEYVALUE2}"},{"relationship-key":"tenant.tenant-id","relationship-value":"${TENANTKEYVALUE}"},{"relationship-key":"cloud-region.cloud-owner","relationship-value":"${CRKEYVALUE1}"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"${CRKEYVALUE2}"}]}
-
-*** Test Cases ***
-Run AAI Put cloud-region
- [Documentation] Create an cloud-region object
- ${resp}= PutWithCert ${CRURL} ${CRDATA}
- log ${CRURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put tenant
- [Documentation] Create an tenant object
- ${resp}= PutWithCert ${TENANTURL} ${TENANTDATA}
- log ${TENANTURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put vserver1
- [Documentation] Create an vserver1 object
- ${resp}= PutWithCert ${VSERVERURL1} ${VSERVERDATA1}
- log ${VSERVERURL1}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put vserver2
- [Documentation] Create an vserver2 object
- ${resp}= PutWithCert ${VSERVERURL2} ${VSERVERDATA2}
- log ${VSERVERURL2}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put snapshot1
- [Documentation] Create an snapshot1 object
- ${resp}= PutWithCert ${SNAPSHOTURL1} ${SNAPSHOTDATA1}
- log ${SNAPSHOTURL1}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put snapshot2
- [Documentation] Create an snapshot2 object
- ${resp}= PutWithCert ${SNAPSHOTURL2} ${SNAPSHOTDATA2}
- log ${SNAPSHOTURL2}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put relationship vserver1 and snapshot1
- [Documentation] Create relationship vserver1 and snapshot1
- ${resp}= PutWithCert ${RELATIONSHIPURL1} ${RELATIONSHIPDATA1}
- log ${RELATIONSHIPURL1}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put relationship vserver1 and snapshot2 (NOT ALLOW)
- [Documentation] Create relationship vserver1 and snapshot2 (NOT ALLOW)
- ${resp}= PutWithCert ${RELATIONSHIPURL1} ${RELATIONSHIPDATA2}
- log ${RELATIONSHIPURL1}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 400
-
-Run AAI Put relationship snapshot1 and vserver2 (NOT ALLOW)
- [Documentation] Create relationship snapshot1 and vserver2 (NOT ALLOW)
- ${resp}= PutWithCert ${RELATIONSHIPURL2} ${RELATIONSHIPDATA3}
- log ${RELATIONSHIPURL2}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 400
-
-Run AAI Get vserver1 to delete
- [Documentation] Get vserver1 object to delete
- ${resp} GetWithCert ${VSERVERURL1}
- 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 vserver1
- [Documentation] Delete the vserver1
- ${resp}= DeleteWithCert ${VSERVERURL1}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get vserver2 to delete
- [Documentation] Get vserver2 object to delete
- ${resp} GetWithCert ${VSERVERURL2}
- 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 vserver2
- [Documentation] Delete the vserver2
- ${resp}= DeleteWithCert ${VSERVERURL2}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get snapshot1 to delete
- [Documentation] Get snapshot1 object to delete
- ${resp} GetWithCert ${SNAPSHOTURL1}
- 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 snapshot1
- [Documentation] Delete the snapshot1
- ${resp}= DeleteWithCert ${SNAPSHOTURL1}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get snapshot2 to delete
- [Documentation] Get snapshot2 object to delete
- ${resp} GetWithCert ${SNAPSHOTURL2}
- 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 snapshot2
- [Documentation] Delete the snapshot2
- ${resp}= DeleteWithCert ${SNAPSHOTURL2}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get tenant to delete
- [Documentation] Get tenant object to delete
- ${resp} GetWithCert ${TENANTURL}
- 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 tenant
- [Documentation] Delete the tenant
- ${resp}= DeleteWithCert ${TENANTURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get cr to delete
- [Documentation] Get cr object to delete
- ${resp} GetWithCert ${CRURL}
- 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 cr
- [Documentation] Delete the cr
- ${resp}= DeleteWithCert ${CRURL}?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/db_edge_rule/prevent_delete.robot b/test/csit/tests/aai/resources/db_edge_rule/prevent_delete.robot
deleted file mode 100644
index beae2da51..000000000
--- a/test/csit/tests/aai/resources/db_edge_rule/prevent_delete.robot
+++ /dev/null
@@ -1,131 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${CRKEYVALUE7} cr-integration-test7
-${CRKEYVALUE8} cr-integration-test8
-${TENANTKEYVALUE} tenant-integration-test7
-${VSERVERKEYVALUE} vserver-integration-test7
-
-${CRURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE7}/${CRKEYVALUE8}
-${TENANTURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE7}/${CRKEYVALUE8}/tenants/tenant/${TENANTKEYVALUE}
-${VSERVERURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${CRKEYVALUE7}/${CRKEYVALUE8}/tenants/tenant/${TENANTKEYVALUE}/vservers/vserver/${VSERVERKEYVALUE}
-${CRDATA} {"cloud-owner":"${CRKEYVALUE7}","cloud-region-id":"${CRKEYVALUE8}","owner-defined-type":"example-owner-defined-type-98787654321-09","cloud-region-version":"example-cloud-region-version-98765784321-09","identity-url":"example-identity-url-98765437821-09","cloud-zone":"example-cloud-zone-98765784321-09","complex-name":"example-complex-name-98765874321-09"}
-${TENANTDATA} {"tenant-id":"${TENANTKEYVALUE}","tenant-name":"example-tenant-name-val-143742","vservers":{"vserver":[{"vserver-id":"${VSERVERKEYVALUE}","vserver-name":"example-vserver-name-val-357201","vserver-name2":"example-vserver-name2-val-672821","prov-status":"example-prov-status-val-137711","vserver-selflink":"example-vserver-selflink-val-58731","in-maint":true,"is-closed-loop-disabled":true}]}}
-
-
-*** Test Cases ***
-Run AAI Put cloud-region
- [Documentation] Create an cloud-region object
- ${resp}= PutWithCert ${CRURL} ${CRDATA}
- log ${CRURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put tenant
- [Documentation] Create an tenant object
- ${resp}= PutWithCert ${TENANTURL} ${TENANTDATA}
- log ${TENANTURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Get tenant to delete
- [Documentation] Get tenant object to delete
- ${resp} GetWithCert ${TENANTURL}
- 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 tenant
- [Documentation] Delete the tenant
- ${resp}= DeleteWithCert ${TENANTURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 400
-
-Run AAI Get vserver to delete
- [Documentation] Get vserver object to delete
- ${resp} GetWithCert ${VSERVERURL}
- 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 vserver
- [Documentation] Delete the vserver
- ${resp}= DeleteWithCert ${VSERVERURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get tenant to delete
- [Documentation] Get tenant object to delete
- ${resp} GetWithCert ${TENANTURL}
- 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 tenant
- [Documentation] Delete the tenant
- ${resp}= DeleteWithCert ${TENANTURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get cr to delete
- [Documentation] Get cr object to delete
- ${resp} GetWithCert ${CRURL}
- 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 cr
- [Documentation] Delete the cr
- ${resp}= DeleteWithCert ${CRURL}?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/error_handling_suite/__init__.robot b/test/csit/tests/aai/resources/error_handling_suite/__init__.robot
deleted file mode 100644
index 538def841..000000000
--- a/test/csit/tests/aai/resources/error_handling_suite/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation Resources - Pserver Suite
diff --git a/test/csit/tests/aai/resources/error_handling_suite/aai.crt b/test/csit/tests/aai/resources/error_handling_suite/aai.crt
deleted file mode 100644
index 6a28bbb8c..000000000
--- a/test/csit/tests/aai/resources/error_handling_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/error_handling_suite/aai.key b/test/csit/tests/aai/resources/error_handling_suite/aai.key
deleted file mode 100644
index 02724df46..000000000
--- a/test/csit/tests/aai/resources/error_handling_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/error_handling_suite/error_403.robot b/test/csit/tests/aai/resources/error_handling_suite/error_403.robot
deleted file mode 100644
index 8178368ae..000000000
--- a/test/csit/tests/aai/resources/error_handling_suite/error_403.robot
+++ /dev/null
@@ -1,47 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${COMPLEXURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes?depth=all
-
-*** Test Cases ***
-Run AAI Get all complex
- [Documentation] Get all complex - not all depth=all
- ${resp} GetWithCert ${COMPLEXURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 403
-
-*** 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} \ No newline at end of file
diff --git a/test/csit/tests/aai/resources/error_handling_suite/error_412_404.robot b/test/csit/tests/aai/resources/error_handling_suite/error_412_404.robot
deleted file mode 100644
index 2d855d514..000000000
--- a/test/csit/tests/aai/resources/error_handling_suite/error_412_404.robot
+++ /dev/null
@@ -1,78 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${PSERVERKEYVALUE} pserver-integration-test1
-${PSERVERURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/pservers/pserver/${PSERVERKEYVALUE}
-${PSERVERDATA} {"hostname":"${PSERVERKEYVALUE}"}
-
-*** Test Cases ***
-Run AAI Put Pserver
- [Documentation] Create an pserver object
- ${resp}= PutWithCert ${PSERVERURL} ${PSERVERDATA}
- log ${PSERVERURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put Pserver again
- [Documentation] Create an pserver object again without resource-version
- ${resp}= PutWithCert ${PSERVERURL} ${PSERVERDATA}
- log ${PSERVERURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 412
-
-Run AAI Get Pserver
- [Documentation] Get the pserver object just created
- ${resp} GetWithCert ${PSERVERURL}
- 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 ${PSERVERURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get Pserver
- [Documentation] Get the pserver object just deleted
- ${resp} GetWithCert ${PSERVERURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 404
-
-*** 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} \ No newline at end of file
diff --git a/test/csit/tests/aai/resources/relationship_suite/__init__.robot b/test/csit/tests/aai/resources/relationship_suite/__init__.robot
deleted file mode 100644
index de8f659d7..000000000
--- a/test/csit/tests/aai/resources/relationship_suite/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation Resources - complex Suite
diff --git a/test/csit/tests/aai/resources/relationship_suite/aai.crt b/test/csit/tests/aai/resources/relationship_suite/aai.crt
deleted file mode 100644
index 6a28bbb8c..000000000
--- a/test/csit/tests/aai/resources/relationship_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/relationship_suite/aai.key b/test/csit/tests/aai/resources/relationship_suite/aai.key
deleted file mode 100644
index 02724df46..000000000
--- a/test/csit/tests/aai/resources/relationship_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/relationship_suite/complex_l3_network.robot b/test/csit/tests/aai/resources/relationship_suite/complex_l3_network.robot
deleted file mode 100644
index bc08ae915..000000000
--- a/test/csit/tests/aai/resources/relationship_suite/complex_l3_network.robot
+++ /dev/null
@@ -1,110 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${COMPLEXKEYVALUE} complex-integration-test2
-${L3NETWORKKEYVALUE} l3-network-integration-test2
-${COMPLEXURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes/complex/${COMPLEXKEYVALUE}
-${L3NETWORKURL} https://${HOST_IP}:8443/aai/v11/network/l3-networks/l3-network/${L3NETWORKKEYVALUE}
-${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"}
-${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","relationship-list":{"relationship":[{"related-to":"complex","relationship-data":[{"relationship-key":"complex.physical-location-id","relationship-value":"${COMPLEXKEYVALUE}"}]}]}}
-
-*** 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
-
-Run AAI Put l3-network relationship with complex
- [Documentation] Create l3-network relationship with complex
- ${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 with relationship with complex
- ${resp} GetWithCert ${L3NETWORKURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Get l3-network to delete
- [Documentation] Get l3-network object to delete
- ${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 just created
- ${resp}= DeleteWithCert ${L3NETWORKURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get complex to delete
- [Documentation] Get complex object to delete
- ${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/relationship_suite/pserver_complex_rel_api.robot b/test/csit/tests/aai/resources/relationship_suite/pserver_complex_rel_api.robot
deleted file mode 100644
index 10f2713ce..000000000
--- a/test/csit/tests/aai/resources/relationship_suite/pserver_complex_rel_api.robot
+++ /dev/null
@@ -1,119 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${COMPLEXKEYVALUE} complex-integration-test3
-${PSERVERKEYVALUE} pserver-integration-test3
-${COMPLEXURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes/complex/${COMPLEXKEYVALUE}
-${PSERVERURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/pservers/pserver/${PSERVERKEYVALUE}
-${PSERVERRELATIONSHIPURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/pservers/pserver/${PSERVERKEYVALUE}/relationship-list/relationship
-${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"}
-${PSERVERDATA} {"hostname":"${PSERVERKEYVALUE}"}
-${RELATIONSHIPDATA} {"related-to":"complex","relationship-data":[{"relationship-key":"complex.physical-location-id","relationship-value":"${COMPLEXKEYVALUE}"}]}
-
-*** 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
-
-Run AAI Put pserver
- [Documentation] Create pserver object
- ${resp}= PutWithCert ${PSERVERURL} ${PSERVERDATA}
- log ${PSERVERURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Get pserver
- [Documentation] Get the pserver
- ${resp} GetWithCert ${PSERVERURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put pserver relationship with complex using relationship api
- [Documentation] Create relationship between pserver and complex
- ${resp}= PutWithCert ${PSERVERRELATIONSHIPURL} ${RELATIONSHIPDATA}
- log ${PSERVERRELATIONSHIPURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Get pserver to delete
- [Documentation] Get pserver object to delete
- ${resp} GetWithCert ${PSERVERURL}
- 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
- ${resp}= DeleteWithCert ${PSERVERURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get complex to delete
- [Documentation] Get complex object to delete
- ${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
- ${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/relationship_suite/relationship_using_related_link.robot b/test/csit/tests/aai/resources/relationship_suite/relationship_using_related_link.robot
deleted file mode 100644
index 5820d4ac6..000000000
--- a/test/csit/tests/aai/resources/relationship_suite/relationship_using_related_link.robot
+++ /dev/null
@@ -1,110 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${COMPLEXKEYVALUE} complex-integration-test8
-${L3NETWORKKEYVALUE} l3-network-integration-test8
-${COMPLEXURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/complexes/complex/${COMPLEXKEYVALUE}
-${L3NETWORKURL} https://${HOST_IP}:8443/aai/v11/network/l3-networks/l3-network/${L3NETWORKKEYVALUE}
-${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"}
-${L3NETWORKDATA} {"network-id":"${L3NETWORKKEYVALUE}","network-name":"example-network-name-val-54688","network-type":"example-network-type-val-57468","network-role":"example-network-role-val-54868","network-technology":"example-network-technology-val-5468","neutron-network-id":"example-neutron-network-id-val-54678","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","relationship-list":{"relationship":[{"related-to":"complex","related-link":"/aai/v11/cloud-infrastructure/complexes/complex/${COMPLEXKEYVALUE}"}]}}
-
-*** 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
-
-Run AAI Put l3-network relationship with complex
- [Documentation] Create l3-network relationship with complex
- ${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 with relationship with complex
- ${resp} GetWithCert ${L3NETWORKURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Get l3-network to delete
- [Documentation] Get l3-network object to delete
- ${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 just created
- ${resp}= DeleteWithCert ${L3NETWORKURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get complex to delete
- [Documentation] Get complex object to delete
- ${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/search-data-service/suite1/__init__.robot b/test/csit/tests/aai/search-data-service/suite1/__init__.robot
deleted file mode 100644
index f14ab69a0..000000000
--- a/test/csit/tests/aai/search-data-service/suite1/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation Search Service - Suite 1
diff --git a/test/csit/tests/aai/search-data-service/suite1/private.key b/test/csit/tests/aai/search-data-service/suite1/private.key
deleted file mode 100644
index 3dd546491..000000000
--- a/test/csit/tests/aai/search-data-service/suite1/private.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAmxCmMHlTR7FkdYpW3rEPOYEGEuIC2/tBvzOxsBwhk/G4qyJ4
-4nKRYMJp/4inuh75vzqd/guYqs2bgoywM2eVTsGDv7ccVrub61mB8gs5G/Yc8xFe
-C9yo8WvV3GBMGSnG2VwZceEDygGmapOY4KK0T6eBUf4UFXE33docQPP4OBzTo/LO
-g//FYjQaO+U6y/+pl5cKPorgem78VI82TTo+Kr0z6sPBQy7JpG1j0VaNgy+QwKtG
-+VlSgBqysLQEbJFQBugd2TlpbcBnRxVHo0xKUQty8JQWrNpwA5YuB99fdvm+GQ5o
-CyaefObEA1XqzS1KqsPoyaODk5xglbhUUqvCNQIDAQABAoIBADRbOsHDNUtPqgvF
-2e72+Z0A43wcs7py65ATdDtyRCQfyap+yTIsXMm+2utcyMUfEFRxBkdwwuto4MkD
-l7rDjrY4wLNKsFbYoZylbCq9f1rhjoTDqG1449IgBuWR3h/g6zMY1b6NqynZxMbX
-bxbp2NfMRu3YTA+xWpuduUx1E6peCssYU+1+jK30tXhY20eqACBjY6DU8MshIxJu
-Mrxztz5xtjXsiHru8yDtpPhopgAF07TdwCt9JZq9/t+ZOqPl0AIQxOP+prJ+owVU
-nS3yt+QExRsK6Iw9GwoAC0eElDRMnYt957jSxsniOwz1m6po8lkFvblixSQ/OVnt
-h86gWUECgYEAyKyeDy72BO+XRVp0mpQa9R2W5f8eZj+ejFRIsE2m0W1LCaFypV+O
-JZvYcEGj27qFAH5W9WbTSm8okVbLjRbeUU6FPT1l8hbXNnsiwiU6MRyODIbLhkQG
-hHonOfpddsHaUcZe+Hnl3SiSuD/4lPMHYUsQxtnpJI+pcsnuZeYsHAcCgYEAxdD6
-bXLPsjws/RUagph0/yOEEytVUg+plhdmHdihFGuGqHCG/i+eoISX2EfnpyHvYR5m
-9LpaJiWiy04nGSZOn3w32kKQhQYkuwYqw6h1/M5ZwR3j6wc2T8gORHxjC8ZT+LlJ
-OINvCTBQSWmUxFwJ0C1B9JiJtKNGEZm7GlaP2OMCgYBbBvIrsQGn+4aCzyVVeRlB
-Vsq8SZ1ghDtHLHRMhOzG0uzW0YVPvqicJrVnNl89rL3oG2cWqi3t9b5RLy3mMhlm
-iFeoD9HOns3AyNpbdseOv4Uv6XUo0nKiZUal5gu/cu+1aGZsD99VErJ7IYmBBzyx
-xXs2uGIpU4FpsG+TiXU4wQKBgQCQQtD+1IXnY78jaiqFJw3bq1j8adO1Hrr8PGA6
-T+tY6vmvCTFJWg0C3u+lyPqFhlf+qZ9HxkdMHpJUVdBppOgdowdQYs7mVA6hXeP+
-AHLbRNlr3pKCqiXPlQPiqhvJUH+YmfduAVwOhW9nulnFwaFeckLxT/TNCW1mFIjA
-snQBJQKBgQCqH+/K/Dzn0z6vX0APSNM7EBp8ap0qsiLucqGzNxslxwTzinXr5ccl
-8bjJxk6+7qUjWaw66wPn+Qs5buxWrKnbf+T5qmEI0bFaBzUBWrVMx1sMdr1Nj69Y
-waWRQaZ45y8J9wN+flBFp9d5wo5JWk6w54hHMiHeMmuXDCw5zO2YMA==
------END RSA PRIVATE KEY-----
diff --git a/test/csit/tests/aai/search-data-service/suite1/publickey.crt b/test/csit/tests/aai/search-data-service/suite1/publickey.crt
deleted file mode 100644
index 5696aa357..000000000
--- a/test/csit/tests/aai/search-data-service/suite1/publickey.crt
+++ /dev/null
@@ -1,25 +0,0 @@
-Bag Attributes
- friendlyName: tomcat
- localKeyID: 54 69 6D 65 20 31 34 39 33 33 32 33 39 32 32 37 35 31
-subject=/C=CA/ST=Ontario/L=Ottawa/O=ONAP/OU=ONAP/CN=ONAP
-issuer=/C=CA/ST=Ontario/L=Ottawa/O=ONAP/OU=ONAP/CN=ONAP
------BEGIN CERTIFICATE-----
-MIIDWTCCAkGgAwIBAgIERWHcIzANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJD
-QTEQMA4GA1UECBMHT250YXJpbzEPMA0GA1UEBxMGT3R0YXdhMQ0wCwYDVQQKEwRP
-TkFQMQ0wCwYDVQQLEwRPTkFQMQ0wCwYDVQQDEwRPTkFQMB4XDTE3MDQyNzIwMDUz
-N1oXDTM3MDExMjIwMDUzN1owXTELMAkGA1UEBhMCQ0ExEDAOBgNVBAgTB09udGFy
-aW8xDzANBgNVBAcTBk90dGF3YTENMAsGA1UEChMET05BUDENMAsGA1UECxMET05B
-UDENMAsGA1UEAxMET05BUDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJsQpjB5U0exZHWKVt6xDzmBBhLiAtv7Qb8zsbAcIZPxuKsieOJykWDCaf+Ip7oe
-+b86nf4LmKrNm4KMsDNnlU7Bg7+3HFa7m+tZgfILORv2HPMRXgvcqPFr1dxgTBkp
-xtlcGXHhA8oBpmqTmOCitE+ngVH+FBVxN93aHEDz+Dgc06PyzoP/xWI0GjvlOsv/
-qZeXCj6K4Hpu/FSPNk06Piq9M+rDwUMuyaRtY9FWjYMvkMCrRvlZUoAasrC0BGyR
-UAboHdk5aW3AZ0cVR6NMSlELcvCUFqzacAOWLgffX3b5vhkOaAsmnnzmxANV6s0t
-SqrD6Mmjg5OcYJW4VFKrwjUCAwEAAaMhMB8wHQYDVR0OBBYEFNji+IU70Qgptn4i
-boq/rOKNAg8tMA0GCSqGSIb3DQEBCwUAA4IBAQBc5mJLeeUUzJ4MujZjn0DS3Lvv
-THJTE54Id1euT3ddzfX3htF0Ewd90YzmLuj1y8r8PXj7b/8Bq+cvoKbmJ42c8h3X
-If0tqde+gYWx1X3NAWHwz00Cje9R0KY4Bx1Cvr39jTw/ESnuSQDKPHBnn8WyAS9K
-08ZhvrVSK54d3U7tDVut9UVva8Scdi12utTAWaOIlusLo3bU9Z6t+tgg7AnQBYc0
-N9oCMbq/MACFlLSdc1J6NITYS8XHY2RS8u88eLbWkCcEEx1glYz/PMX3+V1Ow9Uy
-MjenEx8ifl96ZSOe9XsI2gl2TCaevCY/QuREu4LZB9XmO0gncH7gF5w9Bw2b
------END CERTIFICATE-----
diff --git a/test/csit/tests/aai/search-data-service/suite1/test1.robot b/test/csit/tests/aai/search-data-service/suite1/test1.robot
deleted file mode 100644
index 86554a13a..000000000
--- a/test/csit/tests/aai/search-data-service/suite1/test1.robot
+++ /dev/null
@@ -1,59 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-
-*** Variables ***
-${TARGETURL} https://${HOST_IP}:9509/services/search-data-service/v1/search/indexes/test-index3
-${INDEXDATA} {"fields": [{"name": "Name", "data-type": "string"}, {"name": "Number", "data-type": "long"}]}
-${DOCUMENTDATA} {"Name": "A", "Number": 5}
-
-*** Test Cases ***
-Index Create Test
- [Documentation] Create an index and verify success
- ${resp}= PutWithCert ${TARGETURL} ${INDEXDATA}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Insert Document Test
- [Documentation] Insert a document into the previously created index
- ${resp}= PutWithCert ${TARGETURL}/documents/testdoc ${DOCUMENTDATA}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Get Document Test
- [Documentation] Get the document that was just created
- ${resp} GetWithCert ${TARGETURL}/documents/testdoc
- ${content}= Evaluate $resp.json().get('content')
- ${originaljson}= Evaluate json.loads('${DOCUMENTDATA}') json
- Should Be Equal As Strings ${resp.status_code} 200
- Should Be Equal ${content} ${originaljson}
-
-Delete Index Test
- [Documentation] Delete the index
- ${resp}= DeleteWithCert ${TARGETURL}
- Should Be Equal As Strings ${resp.status_code} 200
-
-*** Keywords ***
-PutWithCert
- [Arguments] ${url} ${data}
- ${certinfo}= Evaluate ('${CURDIR}/publickey.crt', '${CURDIR}/private.key')
- ${resp}= Evaluate requests.put('${url}', data='${data}', cert=${certinfo}, verify=False) requests
- [return] ${resp}
-
-PostWithCert
- [Arguments] ${url} ${data}
- ${certinfo}= Evaluate ('${CURDIR}/publickey.crt', '${CURDIR}/private.key')
- ${resp}= Evaluate requests.post('${url}', data='${data}', cert=${certinfo}, verify=False) requests
- [return] ${resp}
-
-GetWithCert
- [Arguments] ${url}
- ${certinfo}= Evaluate ('${CURDIR}/publickey.crt', '${CURDIR}/private.key')
- ${resp}= Evaluate requests.get('${url}', cert=${certinfo}, verify=False) requests
- [return] ${resp}
-
-DeleteWithCert
- [Arguments] ${url}
- ${certinfo}= Evaluate ('${CURDIR}/publickey.crt', '${CURDIR}/private.key')
- ${resp}= Evaluate requests.delete('${url}', cert=${certinfo}, verify=False) requests
- [return] ${resp}
-
diff --git a/test/csit/tests/aai/traversal/suite1/__init__.robot b/test/csit/tests/aai/traversal/suite1/__init__.robot
deleted file mode 100644
index 8a1ac102d..000000000
--- a/test/csit/tests/aai/traversal/suite1/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation Traversal - Suite1
diff --git a/test/csit/tests/aai/traversal/suite1/aai.crt b/test/csit/tests/aai/traversal/suite1/aai.crt
deleted file mode 100644
index 6a28bbb8c..000000000
--- a/test/csit/tests/aai/traversal/suite1/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/traversal/suite1/aai.key b/test/csit/tests/aai/traversal/suite1/aai.key
deleted file mode 100644
index 02724df46..000000000
--- a/test/csit/tests/aai/traversal/suite1/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/traversal/suite1/custom_query_1.robot b/test/csit/tests/aai/traversal/suite1/custom_query_1.robot
deleted file mode 100644
index 4ced06f2e..000000000
--- a/test/csit/tests/aai/traversal/suite1/custom_query_1.robot
+++ /dev/null
@@ -1,131 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${GENERICVNFKEYVALUE} generic-vnf-integration-test1
-${PSERVERKEYVALUE} pserver-integration-test1
-${GENERICVNFURL} https://${HOST_IP}:8443/aai/v11/network/generic-vnfs/generic-vnf/${GENERICVNFKEYVALUE}
-${PSERVERURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/pservers/pserver/${PSERVERKEYVALUE}
-${RELATIONSHIPURL} https://${HOST_IP}:8443/aai/v11/network/generic-vnfs/generic-vnf/${GENERICVNFKEYVALUE}/relationship-list/relationship
-${CUSTOMQUERYURL} https://${HOST_IP}:8443/aai/v11/query?format=simple
-${GENERICVNFDATA} { "vnf-id": "${GENERICVNFKEYVALUE}", "vnf-name": "example-vnf-name-val-51663", "vnf-name2": "example-vnf-name2-val-15450", "vnf-type": "example-vnf-type-val-32726", "service-id": "example-service-id-val-49385", "regional-resource-zone": "example-regional-resource-zone-val-41257", "prov-status": "example-prov-status-val-5666", "operational-status": "example-operational-status-val-95008", "license-key": "example-license-key-val-25823", "equipment-role": "example-equipment-role-val-30138", "orchestration-status": "example-orchestration-status-val-18897", "heat-stack-id": "example-heat-stack-id-val-46807", "mso-catalog-key": "example-mso-catalog-key-val-43833", "management-option": "example-management-option-val-92040", "ipv4-oam-address": "example-ipv4-oam-address-val-85170", "ipv4-loopback0-address": "example-ipv4-loopback0-address-val-88650", "nm-lan-v6-address": "example-nm-lan-v6-address-val-76997", "management-v6-address": "example-management-v6-address-val-10065", "vcpu": 5182376, "vcpu-units": "example-vcpu-units-val-52149", "vmemory": 35401466, "vmemory-units": "example-vmemory-units-val-46534", "vdisk": 74255232, "vdisk-units": "example-vdisk-units-val-83649", "in-maint": true, "is-closed-loop-disabled": true, "summary-status": "example-summary-status-val-99435", "encrypted-access-flag": true, "entitlement-assignment-group-uuid": "example-entitlement-assignment-group-uuid-val-50758", "entitlement-resource-uuid": "example-entitlement-resource-uuid-val-21058", "license-assignment-group-uuid": "example-license-assignment-group-uuid-val-99092", "license-key-uuid": "example-license-key-uuid-val-93512", "nf-naming-code": "example-nf-naming-code-val-89", "selflink": "example-selflink-val-42557", "ipv4-oam-gateway-address": "example-ipv4-oam-gateway-address-val-50012", "ipv4-oam-gateway-address-prefix-length": 92759, "vlan-id-outer": 20604980, "nm-profile-name": "example-nm-profile-name-val-35055" }
-${PSERVERDATA} { "hostname": "${PSERVERKEYVALUE}", "ptnii-equip-name": "example-ptnii-equip-name-val-91724", "number-of-cpus": 56461, "disk-in-gigabytes": 13534, "ram-in-megabytes": 66589, "equip-type": "example-equip-type-val-94149", "equip-vendor": "example-equip-vendor-val-91811", "equip-model": "example-equip-model-val-26157", "fqdn": "example-fqdn-val-19743", "pserver-selflink": "example-pserver-selflink-val-67676", "ipv4-oam-address": "example-ipv4-oam-address-val-12819", "serial-number": "example-serial-number-val-33384", "ipaddress-v4-loopback-0": "example-ipaddress-v4-loopback0-val-63311", "ipaddress-v6-loopback-0": "example-ipaddress-v6-loopback0-val-70485", "ipaddress-v4-aim": "example-ipaddress-v4-aim-val-23497", "ipaddress-v6-aim": "example-ipaddress-v6-aim-val-24473", "ipaddress-v6-oam": "example-ipaddress-v6-oam-val-38196", "inv-status": "example-inv-status-val-10016", "pserver-id": "example-pserver-id-val-90123", "internet-topology": "example-internet-topology-val-17042", "in-maint": true, "pserver-name2": "example-pserver-name2-val-12304", "purpose": "example-purpose-val-86719", "prov-status": "example-prov-status-val-68126", "management-option": "example-management-option-val-86521", "host-profile": "example-host-profile-val-48679" }
-${CUSTOMQUERYDATA} {"gremlin":"g.V().has(\\'hostname\\', \\'${PSERVERKEYVALUE}\\')"}
-${PSERVER_GENERIC_VNF_RELATIONSHIPDATA} {"related-to":"pserver","relationship-data":[{"relationship-key":"pserver.hostname","relationship-value":"${PSERVERKEYVALUE}"}]}
-
-*** Test Cases ***
-
-Run AAI Put generic-vnf
- [Documentation] Create an generic-vnf object
- ${resp}= PutWithCert ${GENERICVNFURL} ${GENERICVNFDATA}
- log ${GENERICVNFURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put pserver
- [Documentation] Create an pserver object
- ${resp}= PutWithCert ${PSERVERURL} ${PSERVERDATA}
- log ${PSERVERURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put relationship of pserver and generic-vnf
- [Documentation] Create relationship of pserver and generic-vnf
- ${resp}= PutWithCert ${RELATIONSHIPURL} ${PSERVER_GENERIC_VNF_RELATIONSHIPDATA}
- log ${RELATIONSHIPURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Get pserver
- [Documentation] Get the pserver object just relationship
- ${resp} GetWithCert ${PSERVERURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Get generic-vnf
- [Documentation] Get the generic-vnf object just relationship
- ${resp} GetWithCert ${GENERICVNFURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put custom query simple format
- [Documentation] custom query simple format
- log ${CUSTOMQUERYDATA}
- ${resp}= PutWithCert ${CUSTOMQUERYURL} ${CUSTOMQUERYDATA}
- log ${CUSTOMQUERYURL}
- log ${resp.text}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Get generic-vnf to delete
- [Documentation] Get the generic-vnf object to delete
- ${resp} GetWithCert ${GENERICVNFURL}
- 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 generic-vnf
- [Documentation] Delete the generic-vnf
- ${resp}= DeleteWithCert ${GENERICVNFURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get pserver to delete
- [Documentation] Get the pserver object to delete
- ${resp} GetWithCert ${PSERVERURL}
- 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
- ${resp}= DeleteWithCert ${PSERVERURL}?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}
diff --git a/test/csit/tests/aai/traversal/suite1/custom_query_all_formats.robot b/test/csit/tests/aai/traversal/suite1/custom_query_all_formats.robot
deleted file mode 100644
index 0e582603d..000000000
--- a/test/csit/tests/aai/traversal/suite1/custom_query_all_formats.robot
+++ /dev/null
@@ -1,190 +0,0 @@
-*** Settings ***
-Library OperatingSystem
-Library RequestsLibrary
-Library requests
-Library Collections
-
-*** Variables ***
-${GENERICVNFKEYVALUE} generic-vnf-integration-test1
-${PSERVERKEYVALUE} pserver-integration-test1
-${GENERICVNFURL} https://${HOST_IP}:8443/aai/v11/network/generic-vnfs/generic-vnf/${GENERICVNFKEYVALUE}
-${PSERVERURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/pservers/pserver/${PSERVERKEYVALUE}
-${RELATIONSHIPURL} https://${HOST_IP}:8443/aai/v11/network/generic-vnfs/generic-vnf/${GENERICVNFKEYVALUE}/relationship-list/relationship
-${CUSTOMQUERYURL} https://${HOST_IP}:8443/aai/v11/query?format=simple
-${CUSTOMQUERYURL_GRAPHSON} https://${HOST_IP}:8443/aai/v11/query?format=graphson
-${CUSTOMQUERYURL_ID} https://${HOST_IP}:8443/aai/v11/query?format=id
-${CUSTOMQUERYURL_PATHED} https://${HOST_IP}:8443/aai/v11/query?format=pathed
-${CUSTOMQUERYURL_RESOURCE} https://${HOST_IP}:8443/aai/v11/query?format=resource
-${CUSTOMQUERYURL_RESOURCE_URL} https://${HOST_IP}:8443/aai/v11/query?format=resource_and_url
-${CUSTOMQUERYURL_RAW} https://${HOST_IP}:8443/aai/v11/query?format=raw
-${GENERICVNFDATA} {"vnf-id":"${GENERICVNFKEYVALUE}","vnf-name":"example-vnf-name-val-51663","vnf-name2":"example-vnf-name2-val-15450","vnf-type":"example-vnf-type-val-32726"}
-${PSERVERDATA} { "hostname": "${PSERVERKEYVALUE}", "ptnii-equip-name": "example-ptnii-equip-name-val-91724", "number-of-cpus": 56461, "disk-in-gigabytes": 13534, "ram-in-megabytes": 66589, "equip-type": "example-equip-type-val-94149", "equip-vendor": "example-equip-vendor-val-91811", "equip-model": "example-equip-model-val-26157", "fqdn": "example-fqdn-val-19743", "pserver-selflink": "example-pserver-selflink-val-67676", "ipv4-oam-address": "example-ipv4-oam-address-val-12819", "serial-number": "example-serial-number-val-33384", "ipaddress-v4-loopback-0": "example-ipaddress-v4-loopback0-val-63311", "ipaddress-v6-loopback-0": "example-ipaddress-v6-loopback0-val-70485", "ipaddress-v4-aim": "example-ipaddress-v4-aim-val-23497", "ipaddress-v6-aim": "example-ipaddress-v6-aim-val-24473", "ipaddress-v6-oam": "example-ipaddress-v6-oam-val-38196", "inv-status": "example-inv-status-val-10016", "pserver-id": "example-pserver-id-val-90123", "internet-topology": "example-internet-topology-val-17042", "in-maint": true, "pserver-name2": "example-pserver-name2-val-12304", "purpose": "example-purpose-val-86719", "prov-status": "example-prov-status-val-68126", "management-option": "example-management-option-val-86521", "host-profile": "example-host-profile-val-48679" }
-${CUSTOMQUERYDATA} {"gremlin":"g.V().has(\\'hostname\\', \\'${PSERVERKEYVALUE}\\')"}
-${PSERVER_GENERIC_VNF_RELATIONSHIPDATA} {"related-to":"pserver","relationship-data":[{"relationship-key":"pserver.hostname","relationship-value":"${PSERVERKEYVALUE}"}]}
-
-*** Test Cases ***
-Run AAI Put generic-vnf
- [Documentation] Create an generic-vnf object
- ${resp}= PutWithCert ${GENERICVNFURL} ${GENERICVNFDATA}
- log ${GENERICVNFURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put pserver
- [Documentation] Create an pserver object
- ${resp}= PutWithCert ${PSERVERURL} ${PSERVERDATA}
- log ${PSERVERURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 201
-
-Run AAI Put relationship of pserver and generic-vnf
- [Documentation] Create relationship of pserver and generic-vnf
- ${resp}= PutWithCert ${RELATIONSHIPURL} ${PSERVER_GENERIC_VNF_RELATIONSHIPDATA}
- log ${RELATIONSHIPURL}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Get pserver
- [Documentation] Get the pserver object just relationship
- ${resp} GetWithCert ${PSERVERURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Get generic-vnf
- [Documentation] Get the generic-vnf object just relationship
- ${resp} GetWithCert ${GENERICVNFURL}
- log ${resp}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put custom query simple format
- [Documentation] custom query simple format
- log ${CUSTOMQUERYDATA}
- ${resp}= PutWithCert ${CUSTOMQUERYURL} ${CUSTOMQUERYDATA}
- log ${CUSTOMQUERYURL}
- log ${resp.text}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put custom query graphson format
- [Documentation] custom query graphson format
- log ${CUSTOMQUERYDATA}
- ${resp}= PutWithCert ${CUSTOMQUERYURL_GRAPHSON} ${CUSTOMQUERYDATA}
- log ${CUSTOMQUERYURL_GRAPHSON}
- log ${resp.text}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put custom query id format
- [Documentation] custom query id format
- log ${CUSTOMQUERYDATA}
- ${resp}= PutWithCert ${CUSTOMQUERYURL_ID} ${CUSTOMQUERYDATA}
- log ${CUSTOMQUERYURL_ID}
- log ${resp.text}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put custom query pathed format
- [Documentation] custom query pathed format
- log ${CUSTOMQUERYDATA}
- ${resp}= PutWithCert ${CUSTOMQUERYURL_PATHED} ${CUSTOMQUERYDATA}
- log ${CUSTOMQUERYURL_PATHED}
- log ${resp.text}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put custom query resource format
- [Documentation] custom query resource format
- log ${CUSTOMQUERYDATA}
- ${resp}= PutWithCert ${CUSTOMQUERYURL_RESOURCE} ${CUSTOMQUERYDATA}
- log ${CUSTOMQUERYURL_RESOURCE}
- log ${resp.text}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put custom query resource url format
- [Documentation] custom query resource url format
- log ${CUSTOMQUERYDATA}
- ${resp}= PutWithCert ${CUSTOMQUERYURL_RESOURCE_URL} ${CUSTOMQUERYDATA}
- log ${CUSTOMQUERYURL_RESOURCE_URL}
- log ${resp.text}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Put custom query raw format
- [Documentation] custom query raw format
- log ${CUSTOMQUERYDATA}
- ${resp}= PutWithCert ${CUSTOMQUERYURL_RAW} ${CUSTOMQUERYDATA}
- log ${CUSTOMQUERYURL_RAW}
- log ${resp.text}
- log ${resp.json()}
- Should Be Equal As Strings ${resp.status_code} 200
-
-Run AAI Get generic-vnf to delete
- [Documentation] Get the generic-vnf object to delete
- ${resp} GetWithCert ${GENERICVNFURL}
- 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 generic-vnf
- [Documentation] Delete the generic-vnf
- ${resp}= DeleteWithCert ${GENERICVNFURL}?resource-version=${resource_version}
- log ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 204
-
-Run AAI Get pserver to delete
- [Documentation] Get the pserver object to delete
- ${resp} GetWithCert ${PSERVERURL}
- 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
- ${resp}= DeleteWithCert ${PSERVERURL}?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}