Permalink
Browse files

Merge pull request #72 from arax/keystone

Added basic support for OS Keystone
  • Loading branch information...
2 parents 5e7aac7 + fdb03f0 commit 60b3eb916ad69a9d4523e659a1d7294a8af2f8fe @ffeldhaus ffeldhaus committed Mar 12, 2013
Showing with 2,789 additions and 23 deletions.
  1. +25 −18 README.md
  2. +102 −0 features/cassettes/Create_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
  3. +102 −0 features/cassettes/Delete_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
  4. +160 −0 ..._OCCI_Categories_supported_by_the_OCCI_Server/_http_http___141_5_99_69__application_json_200_.yml
  5. +204 −0 ...ng_all_OCCI_Categories_supported_by_the_OCCI_Server/_http_http___141_5_99_69__text_plain_200_.yml
  6. +102 −0 ...OCCI_Categories_supported_by_the_OCCI_Server/_http_http___141_5_99_69__text_plain_200_action_.yml
  7. +102 −0 ...ssettes/Miscellaneous_operation_on_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
  8. +102 −0 features/cassettes/Read_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
  9. +102 −0 features/cassettes/Update_an_OCCI_Resource/_http_http___141_5_99_69__text_plain_201_.yml
  10. +70 −3 lib/occi/api/client/client_http.rb
  11. +1 −1 lib/occi/version.rb
  12. +44 −0 ...ssettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/creates_a_new_compute_resource.yml
  13. +44 −0 ...ssettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/creates_a_new_network_resource.yml
  14. +44 −0 ...ssettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/creates_a_new_storage_resource.yml
  15. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/deletes_a_compute_resource.yml
  16. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/deletes_a_network_resource.yml
  17. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/deletes_a_storage_resource.yml
  18. +44 −0 ...i_Api_Client_ClientHttp/using_media_type_text_plain/deploys_an_instance_based_on_OVF_OVA_file.yml
  19. +44 −0 ...ssettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_all_available_mixins.yml
  20. +44 −0 .../cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_compute_resources.yml
  21. +44 −0 .../cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_network_resources.yml
  22. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_os_tpl_mixins.yml
  23. +44 −0 ...assettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_resource_tpl_mixins.yml
  24. +44 −0 .../cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_storage_resources.yml
  25. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/establishes_connection.yml
  26. +44 −0 ..._ClientHttp/using_media_type_text_plain/instantiates_a_compute_resource_using_type_identifier.yml
  27. +44 −0 ...Client_ClientHttp/using_media_type_text_plain/instantiates_a_compute_resource_using_type_name.yml
  28. +44 −0 ..._ClientHttp/using_media_type_text_plain/instantiates_a_network_resource_using_type_identifier.yml
  29. +44 −0 ...Client_ClientHttp/using_media_type_text_plain/instantiates_a_network_resource_using_type_name.yml
  30. +44 −0 ..._ClientHttp/using_media_type_text_plain/instantiates_a_storage_resource_using_type_identifier.yml
  31. +44 −0 ...Client_ClientHttp/using_media_type_text_plain/instantiates_a_storage_resource_using_type_name.yml
  32. +44 −0 ...Api_Client_ClientHttp/using_media_type_text_plain/lists_all_available_entity_type_identifiers.yml
  33. +44 −0 ...ettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_all_available_entity_types.yml
  34. +44 −0 ...i_Api_Client_ClientHttp/using_media_type_text_plain/lists_all_available_link_type_identifiers.yml
  35. +44 −0 ...ssettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_all_available_link_types.yml
  36. +44 −0 ..._Api_Client_ClientHttp/using_media_type_text_plain/lists_all_available_mixin_type_identifiers.yml
  37. +44 −0 ...settes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_all_available_mixin_types.yml
  38. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_all_available_mixins.yml
  39. +44 −0 ...i_Client_ClientHttp/using_media_type_text_plain/lists_all_available_resource_type_identifiers.yml
  40. +44 −0 ...tes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_all_available_resource_types.yml
  41. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_compute_resources.yml
  42. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_network_resources.yml
  43. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_os_tpl_mixins.yml
  44. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_resource_tpl_mixins.yml
  45. +44 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/lists_storage_resources.yml
  46. +88 −0 spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/refreshes_its_model.yml
  47. +44 −0 ...ci_Api_Client_ClientHttp/using_media_type_text_plain/triggers_an_action_on_a_compute_resource.yml
  48. +44 −0 ...ci_Api_Client_ClientHttp/using_media_type_text_plain/triggers_an_action_on_a_network_resource.yml
  49. +44 −0 ...ci_Api_Client_ClientHttp/using_media_type_text_plain/triggers_an_action_on_a_storage_resource.yml
  50. +1 −1 spec/occi/api/client/client_http_spec.rb
View
@@ -97,9 +97,9 @@ To describe available resources use
To describe specific resources use
- occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource https://<ENDPOINT>:<PORT>/compute/<OCCI_ID> --auth x509
- occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource https://<ENDPOINT>:<PORT>/storage/<OCCI_ID> --auth x509
- occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource https://<ENDPOINT>:<PORT>/network/<OCCI_ID> --auth x509
+ occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource /compute/<OCCI_ID> --auth x509
+ occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource /storage/<OCCI_ID> --auth x509
+ occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource /network/<OCCI_ID> --auth x509
To list available OS templates or Resource templates use
@@ -113,11 +113,11 @@ To describe a specific OS template or Resource template use
To create a compute resource with mixins use
- occi --endpoint https://<ENDPOINT>:<PORT>/ --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --resource-title "My rOCCI VM" --auth x509
+ occi --endpoint https://<ENDPOINT>:<PORT>/ --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --attributes title="My rOCCI VM" --auth x509
To delete a compute resource use
- occi --endpoint https://<ENDPOINT>:<PORT>/ --action delete --resource https://<ENDPOINT>:<PORT>/compute/<OCCI_ID> --auth x509
+ occi --endpoint https://<ENDPOINT>:<PORT>/ --action delete --resource /compute/<OCCI_ID> --auth x509
### Client scripting
@@ -145,7 +145,7 @@ For X.509 auth use
auth.user_cert_password = 'MyPassword'
auth.ca_path = '/Path/To/root-certificates'
-For keystone auth use
+**Deprecated:** For keystone auth use
auth = Hashie::Mash.new
auth.type = 'keystone'
@@ -225,15 +225,15 @@ To create a new compute resource use
To get a description of a specific resource use
- describe "https://<ENDPOINT>:<PORT>/compute/<OCCI_ID>"
- describe "https://<ENDPOINT>:<PORT>/storage/<OCCI_ID>"
- describe "https://<ENDPOINT>:<PORT>/network/<OCCI_ID>"
+ describe "/compute/<OCCI_ID>"
+ describe "/storage/<OCCI_ID>"
+ describe "/network/<OCCI_ID>"
To delete a specific resource use
- delete "https://<ENDPOINT>:<PORT>/compute/<OCCI_ID>"
- delete "https://<ENDPOINT>:<PORT>/storage/<OCCI_ID>"
- delete "https://<ENDPOINT>:<PORT>/network/<OCCI_ID>"
+ delete "/compute/<OCCI_ID>"
+ delete "/storage/<OCCI_ID>"
+ delete "/network/<OCCI_ID>"
#### API
If you need low level access to parts of the OCCI client or need to use more than one instance
@@ -306,15 +306,15 @@ To create a new compute resource use
To get a description of a specific resource use
- client.describe "https://<ENDPOINT>:<PORT>/compute/<OCCI_ID>"
- client.describe "https://<ENDPOINT>:<PORT>/storage/<OCCI_ID>"
- client.describe "https://<ENDPOINT>:<PORT>/network/<OCCI_ID>"
+ client.describe "/compute/<OCCI_ID>"
+ client.describe "/storage/<OCCI_ID>"
+ client.describe "/network/<OCCI_ID>"
To delete a specific resource use
- client.delete "https://<ENDPOINT>:<PORT>/compute/<OCCI_ID>"
- client.delete "https://<ENDPOINT>:<PORT>/storage/<OCCI_ID>"
- client.delete "https://<ENDPOINT>:<PORT>/network/<OCCI_ID>"
+ client.delete "/compute/<OCCI_ID>"
+ client.delete "/storage/<OCCI_ID>"
+ client.delete "/network/<OCCI_ID>"
#### Logging
@@ -387,6 +387,13 @@ The OCCI gem includes all OCCI Core classes necessary to handly arbitrary OCCI o
Changelog
---------
+### Version 3.1
+* added basic OS Keystone support
+* added support for PKCS12 credentials for X.509 authN
+* updated templates for plain output formatting
+* minor client API changes
+* several bugfixes
+
### Version 3.0
* many bugfixes

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 60b3eb9

Please sign in to comment.