Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 34661EB6A for ; Mon, 18 Feb 2013 12:54:27 +0000 (UTC) Received: (qmail 14328 invoked by uid 500); 18 Feb 2013 12:54:27 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 14294 invoked by uid 500); 18 Feb 2013 12:54:26 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 14248 invoked by uid 99); 18 Feb 2013 12:54:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Feb 2013 12:54:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 567D882BF27; Mon, 18 Feb 2013 12:54:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkoper@apache.org To: commits@deltacloud.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: FGCP: added unit tests for provider & realms, incl. VCR recordings and fixed error with unknown id Message-Id: <20130218125426.567D882BF27@tyr.zones.apache.org> Date: Mon, 18 Feb 2013 12:54:26 +0000 (UTC) Updated Branches: refs/heads/master 9a44c9ca8 -> 2a9e21a0b FGCP: added unit tests for provider & realms, incl. VCR recordings and fixed error with unknown id Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/2a9e21a0 Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/2a9e21a0 Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/2a9e21a0 Branch: refs/heads/master Commit: 2a9e21a0bccaef26c30f9350b5400f0ae78c1aeb Parents: 9a44c9c Author: Dies Koper Authored: Mon Feb 18 22:52:59 2013 +1100 Committer: Dies Koper Committed: Mon Feb 18 23:53:34 2013 +1100 ---------------------------------------------------------------------- server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 8 +- ..._0001_must_return_list_of_hardware_profiles.yml | 249 ------ .../test_0001_must_return_list_of_images.yml | 341 -------- ...0002_must_allow_to_filter_hardware_profiles.yml | 249 ------ .../test_0002_must_allow_to_filter_images.yml | 679 --------------- ..._0002_must_return_list_of_hardware_profiles.yml | 126 +++ .../test_0002_must_return_list_of_images.yml | 341 ++++++++ .../test_0002_must_return_list_of_realms.yml | 443 ++++++++++ ...0003_must_allow_to_filter_hardware_profiles.yml | 249 ++++++ .../test_0003_must_allow_to_filter_images.yml | 679 +++++++++++++++ .../test_0003_must_allow_to_filter_realms.yml | 117 +++ ...t_allow_to_retrieve_single_hardware_profile.yml | 249 ------ ...st_0003_must_allow_to_retrieve_single_image.yml | 679 --------------- ...t_allow_to_retrieve_single_hardware_profile.yml | 249 ++++++ ...st_0004_must_allow_to_retrieve_single_image.yml | 679 +++++++++++++++ ...st_0004_must_allow_to_retrieve_single_realm.yml | 117 +++ .../test_0004_must_include_correct_attributes.yml | 126 --- ...st_0005_must_include_at_least_four_profiles.yml | 126 --- .../test_0005_must_include_correct_attributes.yml | 126 +++ ...st_0006_must_include_at_least_four_profiles.yml | 126 +++ .../tests/drivers/fgcp/hardware_profiles_test.rb | 13 +- server/tests/drivers/fgcp/images_test.rb | 8 +- server/tests/drivers/fgcp/provider_test.rb | 27 + server/tests/drivers/fgcp/realms_test.rb | 53 ++ 24 files changed, 3356 insertions(+), 2703 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2a9e21a0/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb ---------------------------------------------------------------------- diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb index af61fe9..c8bcc7b 100644 --- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb +++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb @@ -183,7 +183,13 @@ class FgcpDriver < Deltacloud::BaseDriver # determine id belongs to system or network vsys_id = client.extract_vsys_id(opts[:id]) - vsys = client.get_vsys_attributes(vsys_id)['vsys'][0] + begin + vsys = client.get_vsys_attributes(vsys_id)['vsys'][0] + rescue Exception => ex + return [] if ex.message =~ /VALIDATION_ERROR.*A wrong value is set/ + raise + end + realm_name = vsys['vsysName'][0] limit = '[System]' if opts[:id] != vsys_id # network id specified http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2a9e21a0/server/tests/drivers/fgcp/fixtures/test_0001_must_return_list_of_hardware_profiles.yml ---------------------------------------------------------------------- diff --git a/server/tests/drivers/fgcp/fixtures/test_0001_must_return_list_of_hardware_profiles.yml b/server/tests/drivers/fgcp/fixtures/test_0001_must_return_list_of_hardware_profiles.yml deleted file mode 100644 index 375db3d..0000000 --- a/server/tests/drivers/fgcp/fixtures/test_0001_must_return_list_of_hardware_profiles.yml +++ /dev/null @@ -1,249 +0,0 @@ ---- -recorded_with: VCR 2.4.0 -http_interactions: -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODE0MDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListServerType&Locale=en&Signature=ZPAhBW7w0v3nMkQSGMU5kz82VEVdQeiBhhBNL9O6DfYASHXfQRjjOT7SBLG3%0AFWyiuODgwxQIUG95FNDEeM3B3EZOILyAgid91+SYVV6AgyP0HQgEuRf/bEfS%0AA6eo4fzUclYZXjCN0emtlgD2LXtWvyXyV1s1hNThtOw+M2z6M4LhA8OJBfnu%0Avc8kWrWsvSyx3Lp9fgaDsmsRdyqyZPSP+WQ87jwmrTr62nt7WtCRuXw6VZmO%0AsDpiG8p/lo3nqYSGZMsyRMDyRMXRjCpAFWdecYKMQp0HU2Vwy7U+qLBuVp71%0AVG9gPRTggZFlC8VYpcrD2+wMUqAVxYMsezmxFfmP4Q==%0A&Version=2011-01-31&diskImageId=dummy - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:15 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=F1F21DE292B5B6E71FBC786C383F669A; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - Processing was completed. - SUCCESS - - - amount - - IA - 4.0 - 1 - - 744 - islanda-cbrm_144 - - 7.5 - - advanced - 0.4949 - AUS-VM-0001-0003 - Advanced VM - - - amount - - IA - 1.0 - 1 - - 744 - islanda-cbrm_140 - - 1.7 - - economy - 0.1237 - AUS-VM-0001-0001 - Economy VM - - - amount - - IA - 4.0 - 2 - - 744 - islanda-cbrm_146 - - 15.0 - - high_performance - 0.9898 - AUS-VM-0001-0004 - High-Performance VM - - - amount - - IA - 2.0 - 1 - - 744 - islanda-cbrm_142 - - 3.4 - - standard - 0.2474 - AUS-VM-0001-0002 - Standard VM - - - amount - - IA - 4.0 - 4 - - 744 - islanda-cbrm_146337 - - 30.0 - - w_high - 1.9796 - AUS-VM-0001-0011 - Double-High Performance VM - - - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:15 GMT -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODE1MDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListServerType&Locale=en&Signature=whx93k3+lbm1vrlFzUKl3wibIxxmV/ivgEO9SyS5JUlMtdT+myMbaNMHQwuT%0A83grJL72nWUZZCesk7ZbBMFuHcdpMCaEWnmUM+6qEjQNsHKKsInE8bX/ZmK0%0AJe2BOhDLN+8v1mHE1IYIO4OmzhA1Ql2K8th9lJDyHAGSAorqOJED8K7FkdNV%0Abc22Us08422hT4Y0Gz2tDzd/hoy8kA8sFTA2KDGHB43n9SsZgdRVtyQU45Yj%0AZxnhi+/RwiZymNIA3q3aW3Lc/Zm/DnrBK/g54YoqUK2LjfN/11rUtTz7/zNL%0AzvAxl0yvspcZZ8K7NRC8nlvtlpE68A9rIl4m5/fFyw==%0A&Version=2011-01-31&diskImageId=dummy - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:16 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=696DA083C6FBA66114C588B0B61016F3; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - Processing was completed. - SUCCESS - - - amount - - IA - 4.0 - 1 - - 744 - islanda-cbrm_144 - - 7.5 - - advanced - 0.4949 - AUS-VM-0001-0003 - Advanced VM - - - amount - - IA - 1.0 - 1 - - 744 - islanda-cbrm_140 - - 1.7 - - economy - 0.1237 - AUS-VM-0001-0001 - Economy VM - - - amount - - IA - 4.0 - 2 - - 744 - islanda-cbrm_146 - - 15.0 - - high_performance - 0.9898 - AUS-VM-0001-0004 - High-Performance VM - - - amount - - IA - 2.0 - 1 - - 744 - islanda-cbrm_142 - - 3.4 - - standard - 0.2474 - AUS-VM-0001-0002 - Standard VM - - - amount - - IA - 4.0 - 4 - - 744 - islanda-cbrm_146337 - - 30.0 - - w_high - 1.9796 - AUS-VM-0001-0011 - Double-High Performance VM - - - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:16 GMT http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2a9e21a0/server/tests/drivers/fgcp/fixtures/test_0001_must_return_list_of_images.yml ---------------------------------------------------------------------- diff --git a/server/tests/drivers/fgcp/fixtures/test_0001_must_return_list_of_images.yml b/server/tests/drivers/fgcp/fixtures/test_0001_must_return_list_of_images.yml deleted file mode 100644 index d38d2d8..0000000 --- a/server/tests/drivers/fgcp/fixtures/test_0001_must_return_list_of_images.yml +++ /dev/null @@ -1,341 +0,0 @@ ---- -recorded_with: VCR 2.4.0 -http_interactions: -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODIyMDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListDiskImage&Locale=en&Signature=v8Xbznsd1l2SHLNgA3j+BdhFAooa3J1cdknacEbZ2f0g6vLwChbSGYjtPXmd%0Atp98I4NVFCz4s35+dR2NM9s7c1cnLzgOiv+XPJBl913jAtyfUzQBgCZy6+xG%0A/JIbWSrEgSRw93EyaPjdviwyEhfpFNLw4/J63lbtzhjICY6jU+rtGuu2jzo+%0AOEt+ooZ2M3FDpZsNv19wJ/vrW1E6SADO0kqZmL2GB8emKvH1XbuCOJzT+c7e%0AAcg7f933GqyKeCr+HJol0uOUNUbpFn13g6QJ1YQAC0Q7CoG6ipf3EhzZjmnb%0A0usnkhetiSg71y5alscARMmErrK2XkMCjY4d7ed84g==%0A&Version=2011-01-31 - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:22 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=7C97F13ACCE75CD4642357180FF24340; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - - - UZXC0GRT - - IMG0001_RHEL5_8EN64_v1_24x7SPT - RHEL5.8 64bit(EN) wSPT - Included - Red Hat Enterprise Linux 5.8 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG0002_RHEL5_8EN64_v1_NoSPT - RHEL5.8 64bit(EN) - Included - Red Hat Enterprise Linux 5.8 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG0003_RHEL6_3EN64_v1_24x7SPT - RHEL6.3 64bit(EN) wSPT - Included - Red Hat Enterprise Linux 6.3 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG0004_RHEL6_3EN64_v1_NoSPT - RHEL6.3 64bit(EN) - Included - Red Hat Enterprise Linux 6.3 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG_3c9820_21VKHA77OO - CentOS 5.6 32bit(EN) - - CentOS 5.6 32bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_D30U8UNY6I9S - CentOS 6.2 32bit(EN) - - CentOS 6.2 32bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_D30Y0LNN4WE8 - W2k8R2EESP1(EN) - Included - Windows Server 2008 R2 EE 64bit SP1 (English) - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG_3c9820_FBV3QFG44MPS - CentOS 5.6 64bit(EN) - - CentOS 5.6 64bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_J55YW6UE101DS - CentOS 5.4 32bit(EN) - - CentOS 5.4 32bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_J56Y5PS4FJO5C - W2k8R2SE/SQL2k8R2(EN) - Included - Windows Server 2008 R2 SE 64bit (English) - hvm - UZXC0GRT - 40.0 - - - Included - SQLServer 2008 R2 SE (English) - - - - - UZXC0GRT - - IMG_3c9820_LKNVW2TH31A0W - CentOS 5.4 64bit(EN) - - CentOS 5.4 64bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_LLIPQ3UJ43RWG - W2k8R2SESP1(EN) - Included - Windows Server 2008 R2 SE 64bit SP1 (English) - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG_3c9820_QIEWLLNIF7IF40 - W2k8R2SE/IIS(EN) - Included - Windows Server 2008 R2 SE 64bit (English) - hvm - UZXC0GRT - 40.0 - - - - Internet Information Server 7.5 - - - - - UZXC0GRT - - IMG_3c9820_S24FWXU0Q9VH0JK - CentOS 6.2 64bit(EN) - - CentOS 6.2 64bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_X1W13YQIDAYQ2SQO - RHEL5.7 64bit wSPT - Included - Red Hat Enterprise Linux 5.7 64bit (English) with Support - hvm - UZXC0GRT - 40.0 - - - Processing was completed. - SUCCESS - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:23 GMT -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODIzMDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListServerType&Locale=en&Signature=PU8hMf3zKWKbZiRj8eVEm3L2/AjsFXbENw7nkY5jt4e6OlqdYHOT+2PdsuLT%0AmWrcJG/t6aE3Ndkzyv3pUpQ62RrriIg4scyr+gXPJztIyMpBcfflsn6W+9ks%0ApX6tfdsEm5ITW4egPw2kNEGrZOR8XPsC7v0zv0woQZ/lLSLE+SDTbOFMAE4R%0AHys1tR2yHlQieIjphegW9KfnMipRyX+QsCM+SgphXObpT4uJIvKsJHr/Eafi%0AiK7DM01brFbdVbZzvOjr1g/PqVOeIwgCAsa9xVynFJTfLdQX+GFQG3DU76oD%0AQtlBJSqXSKbxG5OuGS1DVSWrATH+I7wD1oPdXN/Akg==%0A&Version=2011-01-31&diskImageId=dummy - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:24 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=7A7893C252855EB637B7EBE38FE31A9F; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - Processing was completed. - SUCCESS - - - amount - - IA - 4.0 - 1 - - 744 - islanda-cbrm_144 - - 7.5 - - advanced - 0.4949 - AUS-VM-0001-0003 - Advanced VM - - - amount - - IA - 1.0 - 1 - - 744 - islanda-cbrm_140 - - 1.7 - - economy - 0.1237 - AUS-VM-0001-0001 - Economy VM - - - amount - - IA - 4.0 - 2 - - 744 - islanda-cbrm_146 - - 15.0 - - high_performance - 0.9898 - AUS-VM-0001-0004 - High-Performance VM - - - amount - - IA - 2.0 - 1 - - 744 - islanda-cbrm_142 - - 3.4 - - standard - 0.2474 - AUS-VM-0001-0002 - Standard VM - - - amount - - IA - 4.0 - 4 - - 744 - islanda-cbrm_146337 - - 30.0 - - w_high - 1.9796 - AUS-VM-0001-0011 - Double-High Performance VM - - - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:24 GMT http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2a9e21a0/server/tests/drivers/fgcp/fixtures/test_0002_must_allow_to_filter_hardware_profiles.yml ---------------------------------------------------------------------- diff --git a/server/tests/drivers/fgcp/fixtures/test_0002_must_allow_to_filter_hardware_profiles.yml b/server/tests/drivers/fgcp/fixtures/test_0002_must_allow_to_filter_hardware_profiles.yml deleted file mode 100644 index 3760d77..0000000 --- a/server/tests/drivers/fgcp/fixtures/test_0002_must_allow_to_filter_hardware_profiles.yml +++ /dev/null @@ -1,249 +0,0 @@ ---- -recorded_with: VCR 2.4.0 -http_interactions: -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODEwMDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListServerType&Locale=en&Signature=trnkaYnKzTfiFzi/h1XS4BsOfG0nyH2KVwiEfJaXRvHjuHfWNm/qfuoz2R+L%0Ak+fFPJjFUENa7EO/jDBBXJDuzowk3Fr/q+EBVX30xrb43vzp5Pkt+XrbEFxM%0A7pNJkyCgpl+u+8+UZnl0cNMP8MEGybiSeTRUPkYRWP7e9sVz+B55QIuo7WTu%0AjJzzHc/WKHUm0MUo6VbzBhJeec2SBuHKtPzix2mkysr/USt+49vmq7iWdg9E%0ABUPSAZSp83oIqD9v3e0v8XR8d7CaP6xRWsc8BEMLwnCQ6Ksz3bIHmRvtbVjZ%0A8qSj4ubyGW5xpoVVNVZve9LEES2/aE1DUMUDt26pUg==%0A&Version=2011-01-31&diskImageId=dummy - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:11 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=895B2FE83FC5342D2EDE05A2F2AB4F3E; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - Processing was completed. - SUCCESS - - - amount - - IA - 4.0 - 1 - - 744 - islanda-cbrm_144 - - 7.5 - - advanced - 0.4949 - AUS-VM-0001-0003 - Advanced VM - - - amount - - IA - 1.0 - 1 - - 744 - islanda-cbrm_140 - - 1.7 - - economy - 0.1237 - AUS-VM-0001-0001 - Economy VM - - - amount - - IA - 4.0 - 2 - - 744 - islanda-cbrm_146 - - 15.0 - - high_performance - 0.9898 - AUS-VM-0001-0004 - High-Performance VM - - - amount - - IA - 2.0 - 1 - - 744 - islanda-cbrm_142 - - 3.4 - - standard - 0.2474 - AUS-VM-0001-0002 - Standard VM - - - amount - - IA - 4.0 - 4 - - 744 - islanda-cbrm_146337 - - 30.0 - - w_high - 1.9796 - AUS-VM-0001-0011 - Double-High Performance VM - - - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:11 GMT -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODExMDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListServerType&Locale=en&Signature=HwZoQ9g9uGZafQeCnLp8HR4h0zZoKnPUAHLqu2T+85wIodVA8jKH/EfuN3FA%0A8excnXNtqLKycDxPAQygdcwrXR+ISnuvc9kTnG+FNPGMTRe7wY72ySyWoJIM%0ANhQIFepc88kU3wvstzbHrqepxbrk/Kbv8VxmiB0pmyl/MGBvolMebN541A+b%0AVMgpARRiS5Mb24ayixdAwGdrzGHqoKsLWAu8GHgRtlXgcZT/n3CLNi9tWHAd%0A31NqAbq76vugM5RGOrzEzbyZKRNFywyQZsN7CsiF/5r/qrmUw9p5W74mKgFO%0A2ETr/pfBlpc8XclH+D+IBeXJNlFgLuT+Z8TzJ6kb/w==%0A&Version=2011-01-31&diskImageId=dummy - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:12 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=BD8ECD9238F58200DC4C6DFA2FFF045A; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - Processing was completed. - SUCCESS - - - amount - - IA - 4.0 - 1 - - 744 - islanda-cbrm_144 - - 7.5 - - advanced - 0.4949 - AUS-VM-0001-0003 - Advanced VM - - - amount - - IA - 1.0 - 1 - - 744 - islanda-cbrm_140 - - 1.7 - - economy - 0.1237 - AUS-VM-0001-0001 - Economy VM - - - amount - - IA - 4.0 - 2 - - 744 - islanda-cbrm_146 - - 15.0 - - high_performance - 0.9898 - AUS-VM-0001-0004 - High-Performance VM - - - amount - - IA - 2.0 - 1 - - 744 - islanda-cbrm_142 - - 3.4 - - standard - 0.2474 - AUS-VM-0001-0002 - Standard VM - - - amount - - IA - 4.0 - 4 - - 744 - islanda-cbrm_146337 - - 30.0 - - w_high - 1.9796 - AUS-VM-0001-0011 - Double-High Performance VM - - - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:12 GMT http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2a9e21a0/server/tests/drivers/fgcp/fixtures/test_0002_must_allow_to_filter_images.yml ---------------------------------------------------------------------- diff --git a/server/tests/drivers/fgcp/fixtures/test_0002_must_allow_to_filter_images.yml b/server/tests/drivers/fgcp/fixtures/test_0002_must_allow_to_filter_images.yml deleted file mode 100644 index d565612..0000000 --- a/server/tests/drivers/fgcp/fixtures/test_0002_must_allow_to_filter_images.yml +++ /dev/null @@ -1,679 +0,0 @@ ---- -recorded_with: VCR 2.4.0 -http_interactions: -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODI0MDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListDiskImage&Locale=en&Signature=rUT0CKUe2YHzwS21/WvehpqGxdhaqH7AgfFPNHNaQzCVOx4NgvVDT+Z+sFpP%0AFt32i1VaBd5R++haqPtSi6H1181CMTi2u7O9Gb5vJQkqyhWE/LeaDiKxvi6V%0AbYFHyOBHxtodFwGrVqf09HDbRXMpymDAh3VPUGixCZge39Q4oGabSAtZLxem%0AahMj3/lseBTU5l/ql5K1qjfl/n+vO366tgG6uv7/ZTzV+NnSXjTAtWAEyFia%0AbgHQQBI9sZA9yoV9abmGly1RX1FRXEbjs16w9mJNUZPv5fXiAb8GAaYx1MEV%0AFwFwbe7LdrZ2m+6by6KD+oJISrtGJHf9Nkm3MsJndw==%0A&Version=2011-01-31 - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:25 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=C46AF488794781319EA9702917E30183; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - - - UZXC0GRT - - IMG0001_RHEL5_8EN64_v1_24x7SPT - RHEL5.8 64bit(EN) wSPT - Included - Red Hat Enterprise Linux 5.8 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG0002_RHEL5_8EN64_v1_NoSPT - RHEL5.8 64bit(EN) - Included - Red Hat Enterprise Linux 5.8 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG0003_RHEL6_3EN64_v1_24x7SPT - RHEL6.3 64bit(EN) wSPT - Included - Red Hat Enterprise Linux 6.3 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG0004_RHEL6_3EN64_v1_NoSPT - RHEL6.3 64bit(EN) - Included - Red Hat Enterprise Linux 6.3 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG_3c9820_21VKHA77OO - CentOS 5.6 32bit(EN) - - CentOS 5.6 32bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_D30U8UNY6I9S - CentOS 6.2 32bit(EN) - - CentOS 6.2 32bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_D30Y0LNN4WE8 - W2k8R2EESP1(EN) - Included - Windows Server 2008 R2 EE 64bit SP1 (English) - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG_3c9820_FBV3QFG44MPS - CentOS 5.6 64bit(EN) - - CentOS 5.6 64bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_J55YW6UE101DS - CentOS 5.4 32bit(EN) - - CentOS 5.4 32bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_J56Y5PS4FJO5C - W2k8R2SE/SQL2k8R2(EN) - Included - Windows Server 2008 R2 SE 64bit (English) - hvm - UZXC0GRT - 40.0 - - - Included - SQLServer 2008 R2 SE (English) - - - - - UZXC0GRT - - IMG_3c9820_LKNVW2TH31A0W - CentOS 5.4 64bit(EN) - - CentOS 5.4 64bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_LLIPQ3UJ43RWG - W2k8R2SESP1(EN) - Included - Windows Server 2008 R2 SE 64bit SP1 (English) - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG_3c9820_QIEWLLNIF7IF40 - W2k8R2SE/IIS(EN) - Included - Windows Server 2008 R2 SE 64bit (English) - hvm - UZXC0GRT - 40.0 - - - - Internet Information Server 7.5 - - - - - UZXC0GRT - - IMG_3c9820_S24FWXU0Q9VH0JK - CentOS 6.2 64bit(EN) - - CentOS 6.2 64bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_X1W13YQIDAYQ2SQO - RHEL5.7 64bit wSPT - Included - Red Hat Enterprise Linux 5.7 64bit (English) with Support - hvm - UZXC0GRT - 40.0 - - - Processing was completed. - SUCCESS - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:26 GMT -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODI2MDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListServerType&Locale=en&Signature=khYgVzLiWlm+pTtiNxASl4yAbm8M20elcbnJui2czpKC3YPSRWk24qr0HJD9%0A9qe4XheCQSguMhdYCQTd7U+eB1FJpJEDvk19nFBiWBmIcvjna92haBAlt3AA%0AGolou85DGTo9CVntjhQsMCau2ZNMtGfJov81F3sgdmrtEQauWNJM28i/CV2Q%0Auy23nzsbuISLXSh1SNiVIZIpK0RhTVb9SYv11jTeTJjEURY+QdDwqNHMnZTH%0AJ3Zp2JId+6ZfikOg2P9slMLXNEhodJIt4C8vK+RPo8Q9ZQIvhZy+yDa8+X6I%0A622QEK1lzECAMh/T1VX1MPTG9VyaZyVqw8kBYtLCQQ==%0A&Version=2011-01-31&diskImageId=dummy - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:27 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=3CB1A31CD36466E41C7A928FBF639A4A; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - Processing was completed. - SUCCESS - - - amount - - IA - 4.0 - 1 - - 744 - islanda-cbrm_144 - - 7.5 - - advanced - 0.4949 - AUS-VM-0001-0003 - Advanced VM - - - amount - - IA - 1.0 - 1 - - 744 - islanda-cbrm_140 - - 1.7 - - economy - 0.1237 - AUS-VM-0001-0001 - Economy VM - - - amount - - IA - 4.0 - 2 - - 744 - islanda-cbrm_146 - - 15.0 - - high_performance - 0.9898 - AUS-VM-0001-0004 - High-Performance VM - - - amount - - IA - 2.0 - 1 - - 744 - islanda-cbrm_142 - - 3.4 - - standard - 0.2474 - AUS-VM-0001-0002 - Standard VM - - - amount - - IA - 4.0 - 4 - - 744 - islanda-cbrm_146337 - - 30.0 - - w_high - 1.9796 - AUS-VM-0001-0011 - Double-High Performance VM - - - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:27 GMT -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODI3MDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListDiskImage&Locale=en&Signature=H2v6F5XT4k0naC19ZmNz7QVof1EIbkr5okJ69J08/DXWb7hKhUA9pmaKt8oB%0A0925mrF1rynp6OvmwimwZOhTuPdS+FrXQ1IkjXiQoipoAgRlJeH7K+MCeYYq%0An4wafTD8I5kCeyxa7lWE2zOZI+5BM6MsXJbDUQ6gP6ZRL2vJD0TKs/mhrvbm%0AJ+XVWyA4oA5fLxD5dUq+JecKl5hC43yKXmmaFaXOWlnUZbnrTp19ki4jmezM%0AEEhrpYe8IlgpqUFLPLiDMfyUzErJ60xr5r3tmXtEX7DsV13okNwCkfhYf7ih%0ANwNmikZQOTUawy0u7JBDiSpEkproEtx+vvnehbGehQ==%0A&Version=2011-01-31 - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:27 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=12E65B5611016F68D0A251E0F968382A; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - - - UZXC0GRT - - IMG0001_RHEL5_8EN64_v1_24x7SPT - RHEL5.8 64bit(EN) wSPT - Included - Red Hat Enterprise Linux 5.8 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG0002_RHEL5_8EN64_v1_NoSPT - RHEL5.8 64bit(EN) - Included - Red Hat Enterprise Linux 5.8 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG0003_RHEL6_3EN64_v1_24x7SPT - RHEL6.3 64bit(EN) wSPT - Included - Red Hat Enterprise Linux 6.3 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG0004_RHEL6_3EN64_v1_NoSPT - RHEL6.3 64bit(EN) - Included - Red Hat Enterprise Linux 6.3 64bit - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG_3c9820_21VKHA77OO - CentOS 5.6 32bit(EN) - - CentOS 5.6 32bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_D30U8UNY6I9S - CentOS 6.2 32bit(EN) - - CentOS 6.2 32bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_D30Y0LNN4WE8 - W2k8R2EESP1(EN) - Included - Windows Server 2008 R2 EE 64bit SP1 (English) - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG_3c9820_FBV3QFG44MPS - CentOS 5.6 64bit(EN) - - CentOS 5.6 64bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_J55YW6UE101DS - CentOS 5.4 32bit(EN) - - CentOS 5.4 32bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_J56Y5PS4FJO5C - W2k8R2SE/SQL2k8R2(EN) - Included - Windows Server 2008 R2 SE 64bit (English) - hvm - UZXC0GRT - 40.0 - - - Included - SQLServer 2008 R2 SE (English) - - - - - UZXC0GRT - - IMG_3c9820_LKNVW2TH31A0W - CentOS 5.4 64bit(EN) - - CentOS 5.4 64bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_LLIPQ3UJ43RWG - W2k8R2SESP1(EN) - Included - Windows Server 2008 R2 SE 64bit SP1 (English) - hvm - UZXC0GRT - 40.0 - - - UZXC0GRT - - IMG_3c9820_QIEWLLNIF7IF40 - W2k8R2SE/IIS(EN) - Included - Windows Server 2008 R2 SE 64bit (English) - hvm - UZXC0GRT - 40.0 - - - - Internet Information Server 7.5 - - - - - UZXC0GRT - - IMG_3c9820_S24FWXU0Q9VH0JK - CentOS 6.2 64bit(EN) - - CentOS 6.2 64bit (English) - pv - UZXC0GRT - 10.0 - - - UZXC0GRT - - IMG_3c9820_X1W13YQIDAYQ2SQO - RHEL5.7 64bit wSPT - Included - Red Hat Enterprise Linux 5.7 64bit (English) with Support - hvm - UZXC0GRT - 40.0 - - - Processing was completed. - SUCCESS - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:28 GMT -- request: - method: get - uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTgyODI4MDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListServerType&Locale=en&Signature=URN8gXp8uW5gojsDViTNobmtplrOC16HPwiRSqiyTgodD+bLciVXION75zGa%0AGlE4xSFxNNZYmhicbaSOHp+15AQz2rjF7NEfqMDrtOk4PlqHDGp5/SVxzwQD%0AsAqS9XTq8weyF+x/xJJEGOjBp8mLN2vyOtq3dcibWP0OsHVPIvOcDfivOGwb%0Af9BsuHDYaKAjIqlzvhB1wL1eD7A7dWyvknWcdlGYVfUns2KdArUtTktKaN4v%0Ax7dU0h7BBcWZn/5nOE+QCbVo60m8Ii5YcLQjDGJLHJsvl6F6r6onXFJRRebT%0AP9JKhZg/zaZdviqDNoFwhjMIUGe1nS8oNyKe6lmoBg==%0A&Version=2011-01-31&diskImageId=dummy - body: - string: "" - headers: - Accept: - - text/xml - User-Agent: - - OViSS-API-CLIENT - response: - status: - code: 200 - message: OK - headers: - Date: - - Mon, 18 Feb 2013 10:20:29 GMT - Transfer-Encoding: - - chunked - Set-Cookie: - - JSESSIONID=A6CBCF3F7C6249E68EC518AACB544020; Path=/ovisspxy; Secure - Content-Type: - - text/xml;charset=UTF-8 - Connection: - - close - body: - string: | - - - Processing was completed. - SUCCESS - - - amount - - IA - 4.0 - 1 - - 744 - islanda-cbrm_144 - - 7.5 - - advanced - 0.4949 - AUS-VM-0001-0003 - Advanced VM - - - amount - - IA - 1.0 - 1 - - 744 - islanda-cbrm_140 - - 1.7 - - economy - 0.1237 - AUS-VM-0001-0001 - Economy VM - - - amount - - IA - 4.0 - 2 - - 744 - islanda-cbrm_146 - - 15.0 - - high_performance - 0.9898 - AUS-VM-0001-0004 - High-Performance VM - - - amount - - IA - 2.0 - 1 - - 744 - islanda-cbrm_142 - - 3.4 - - standard - 0.2474 - AUS-VM-0001-0002 - Standard VM - - - amount - - IA - 4.0 - 4 - - 744 - islanda-cbrm_146337 - - 30.0 - - w_high - 1.9796 - AUS-VM-0001-0011 - Double-High Performance VM - - - - - - http_version: - recorded_at: Mon, 18 Feb 2013 10:20:29 GMT http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2a9e21a0/server/tests/drivers/fgcp/fixtures/test_0002_must_return_list_of_hardware_profiles.yml ---------------------------------------------------------------------- diff --git a/server/tests/drivers/fgcp/fixtures/test_0002_must_return_list_of_hardware_profiles.yml b/server/tests/drivers/fgcp/fixtures/test_0002_must_return_list_of_hardware_profiles.yml new file mode 100644 index 0000000..cccb910 --- /dev/null +++ b/server/tests/drivers/fgcp/fixtures/test_0002_must_return_list_of_hardware_profiles.yml @@ -0,0 +1,126 @@ +--- +http_interactions: +- request: + method: get + uri: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint?AccessKeyId=QVVTIEVhc3Rlcm4gRGF5bGlnaHQgVGltZSYxMzYxMTg4ODQyMDAwJjEuMCZT%0ASEExd2l0aFJTQQ==%0A&Action=ListServerType&Locale=en&Signature=fzDXA+UtOl6eZ2Fj0f8QaXCLhzeotZ7MFR6X/x+y5QIOpp5pBXuNB5P2dbxz%0ASyzfiDMY1wwLQguqoSHpM+M5ZVFc37xpODQ34bM39Qh3GqoutrXIWk0fWH6T%0AaGE+2606+MwaD4A51kw2P2JhIsJWLO1SCgtEFBVUYMeZLQxSLMtrrDoBfiYk%0AVqO7yXg/HYd9GzgFtg7WfHIWjgRKqsh8/whJYx8TFiYZn7qK/p1wRRwso0po%0AhiN2b5XIWsxhKSMaporv1Nt9p8BYY6aFYf5zCo22IquQW388qX9zq+EiE5/K%0AAj24BCRP9T4sGKCKVPURp/f6JAe35+il1bBWlhPhvg==%0A&Version=2011-01-31&diskImageId=dummy + body: + string: "" + headers: + Accept: + - text/xml + User-Agent: + - OViSS-API-CLIENT + response: + status: + code: 200 + message: OK + headers: + Connection: + - close + Date: + - Mon, 18 Feb 2013 12:00:43 GMT + Transfer-Encoding: + - chunked + Content-Type: + - text/xml;charset=UTF-8 + Set-Cookie: + - JSESSIONID=B59D07AF56831CE2C20C42F3C9F2241B; Path=/ovisspxy; Secure + body: + string: | + + + Processing was completed. + SUCCESS + + + amount + + IA + 4.0 + 1 + + 744 + islanda-cbrm_144 + + 7.5 + + advanced + 0.4949 + AUS-VM-0001-0003 + Advanced VM + + + amount + + IA + 1.0 + 1 + + 744 + islanda-cbrm_140 + + 1.7 + + economy + 0.1237 + AUS-VM-0001-0001 + Economy VM + + + amount + + IA + 4.0 + 2 + + 744 + islanda-cbrm_146 + + 15.0 + + high_performance + 0.9898 + AUS-VM-0001-0004 + High-Performance VM + + + amount + + IA + 2.0 + 1 + + 744 + islanda-cbrm_142 + + 3.4 + + standard + 0.2474 + AUS-VM-0001-0002 + Standard VM + + + amount + + IA + 4.0 + 4 + + 744 + islanda-cbrm_146337 + + 30.0 + + w_high + 1.9796 + AUS-VM-0001-0011 + Double-High Performance VM + + + + + + http_version: + recorded_at: Mon, 18 Feb 2013 12:00:43 GMT +recorded_with: VCR 2.4.0