You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by ma...@redhat.com on 2012/03/12 18:14:34 UTC
[PATCH 1/3] CIMI :: change references in views from 'uri' to 'id'
From: marios <ma...@redhat.com>
Signed-off-by: marios <ma...@redhat.com>
---
clients/cimi/views/cloud_entry_point/index.haml | 6 +++---
clients/cimi/views/machine_admins/index.haml | 8 ++++----
clients/cimi/views/machine_admins/show.haml | 6 +++---
.../cimi/views/machine_configurations/index.haml | 8 ++++----
.../cimi/views/machine_configurations/show.haml | 6 +++---
clients/cimi/views/machine_images/index.haml | 8 ++++----
clients/cimi/views/machine_images/show.haml | 6 +++---
clients/cimi/views/machine_templates/index.haml | 4 ++--
clients/cimi/views/machine_templates/show.haml | 6 +++---
clients/cimi/views/machines/index.haml | 8 ++++----
clients/cimi/views/machines/show.haml | 6 +++---
.../cimi/views/network_configurations/index.haml | 8 ++++----
.../cimi/views/network_configurations/show.haml | 8 ++++----
clients/cimi/views/networks/index.haml | 8 ++++----
clients/cimi/views/networks/show.haml | 8 ++++----
.../cimi/views/volume_configurations/index.haml | 4 ++--
clients/cimi/views/volume_configurations/show.haml | 8 ++++----
clients/cimi/views/volume_images/index.haml | 8 ++++----
clients/cimi/views/volume_images/show.haml | 8 ++++----
clients/cimi/views/volumes/index.haml | 6 +++---
clients/cimi/views/volumes/show.haml | 6 +++---
21 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/clients/cimi/views/cloud_entry_point/index.haml b/clients/cimi/views/cloud_entry_point/index.haml
index 189c71a..9621bc8 100644
--- a/clients/cimi/views/cloud_entry_point/index.haml
+++ b/clients/cimi/views/cloud_entry_point/index.haml
@@ -7,8 +7,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@entry_point.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@entry_point.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@entry_point.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@entry_point.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -25,6 +25,6 @@
=not_implemented(entity)
- details('Collection details') do
- - row 'URI', @entry_point.uri
+ - row 'ID', @entry_point.id
- row 'Description', @entry_point.description
- row 'Created', @entry_point.created
diff --git a/clients/cimi/views/machine_admins/index.haml b/clients/cimi/views/machine_admins/index.haml
index a8bab3c..3b0e1ae 100644
--- a/clients/cimi/views/machine_admins/index.haml
+++ b/clients/cimi/views/machine_admins/index.haml
@@ -10,8 +10,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@machine_admins.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@machine_admins.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@machine_admins.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@machine_admins.id}?format=json", :class => 'label warning' } JSON
%p
%a{ :href => '#adminModal', :class => 'btn btn-primary', :'data-toggle' => :modal } New Machine Admin
@@ -36,7 +36,7 @@
%a{ :href => '#', :class => 'btn', :'data-dismiss' => 'modal'} Cancel
%blockquote
- %p
+ %p
A Machine Admin Collection entity represents the collection of Machine Admin
entities within a Provider. This entity can be used to locate and create
MachineAdmins.
@@ -49,6 +49,6 @@
%a{ :href => "/cimi/machine_admins/#{conf.href.split('/').last}"}=conf.href.split('/').last
- details 'Collection details' do
- - row 'URI', @machine_admins.uri
+ - row 'ID', @machine_admins.id
- row 'Description', @machine_admins.description
- row 'Created', @machine_admins.created
diff --git a/clients/cimi/views/machine_admins/show.haml b/clients/cimi/views/machine_admins/show.haml
index abf8e88..2e95ea7 100644
--- a/clients/cimi/views/machine_admins/show.haml
+++ b/clients/cimi/views/machine_admins/show.haml
@@ -13,8 +13,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@machine_admin.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@machine_admin.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@machine_admin.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@machine_admin.id}?format=json", :class => 'label warning' } JSON
%p
%form{ :action => "/cimi/machine_admins/#{@machine_admin.name}/delete", :method => :post, :style => 'display:inline'}
%input{ :type => :hidden, :name => '_method', :value => 'delete'}
@@ -26,7 +26,7 @@
initial administrative super- user of a newly created Machine
- details 'MachineAdmin Details' do
- - row 'URI', @machine_admin.uri
+ - row 'ID', @machine_admin.id
- row 'Description', @machine_admin.description
- row 'Created', @machine_admin.created
- row 'Username', boolean_span_for(@machine_admin.username)
diff --git a/clients/cimi/views/machine_configurations/index.haml b/clients/cimi/views/machine_configurations/index.haml
index 0f9e8b3..01d194d 100644
--- a/clients/cimi/views/machine_configurations/index.haml
+++ b/clients/cimi/views/machine_configurations/index.haml
@@ -10,11 +10,11 @@
- content_for :actions do
%p
- %a{ :href => "#{@machine_configurations.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@machine_configurations.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@machine_configurations.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@machine_configurations.id}?format=json", :class => 'label warning' } JSON
%blockquote
- %p
+ %p
A Machine Configuration Collection entity represents the collection of
Machine Configuration entities within a Provider. This entity can be used to
locate and create Machine Configurations.
@@ -26,6 +26,6 @@
%a{ :href => "/cimi/machine_configurations/#{conf.href.split('/').last}"}=conf.href.split('/').last
- details('Collection details') do
- - row 'URI', @machine_configurations.uri
+ - row 'ID', @machine_configurations.id
- row 'Description', @machine_configurations.description
- row 'Created', @machine_configurations.created
diff --git a/clients/cimi/views/machine_configurations/show.haml b/clients/cimi/views/machine_configurations/show.haml
index 7eff926..6484123 100644
--- a/clients/cimi/views/machine_configurations/show.haml
+++ b/clients/cimi/views/machine_configurations/show.haml
@@ -13,8 +13,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@machine_configuration.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@machine_configuration.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@machine_configuration.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@machine_configuration.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -24,7 +24,7 @@
Providers discretion, be created by Consumers.
- details('MachineConfiguration details') do
- - row 'URI', @machine_configuration.uri
+ - row 'ID', @machine_configuration.id
- row 'Description', @machine_configuration.description
- row 'Created', @machine_configuration.created
- row '# of CPU', @machine_configuration.cpu
diff --git a/clients/cimi/views/machine_images/index.haml b/clients/cimi/views/machine_images/index.haml
index defad9a..af4da79 100644
--- a/clients/cimi/views/machine_images/index.haml
+++ b/clients/cimi/views/machine_images/index.haml
@@ -10,11 +10,11 @@
- content_for :actions do
%p
- %a{ :href => "#{@machine_images.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@machine_images.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@machine_images.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@machine_images.id}?format=json", :class => 'label warning' } JSON
%blockquote
- %p
+ %p
A Machine Image Collection entity represents the collection of Machine Image
entities within a Provider. This entity can be used to locate and create
Machine Images.
@@ -26,6 +26,6 @@
%a{ :href => "/cimi/machine_images/#{image.href.split('/').last}"}=image.href.split('/').last
- details('Collection details') do
- - row 'URI', @machine_images.uri
+ - row 'ID', @machine_images.id
- row 'Description', @machine_images.description
- row 'Created', @machine_images.created
diff --git a/clients/cimi/views/machine_images/show.haml b/clients/cimi/views/machine_images/show.haml
index af5ba91..0dfda3f 100644
--- a/clients/cimi/views/machine_images/show.haml
+++ b/clients/cimi/views/machine_images/show.haml
@@ -13,8 +13,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@machine_image.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@machine_image.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@machine_image.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@machine_image.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -23,7 +23,7 @@
Machine Instance
- details 'MachineImage details' do
- - row 'URI', @machine_image.uri
+ - row 'ID', @machine_image.id
- row 'Description', @machine_image.description
- row 'Created', @machine_image.created
- row 'Image Location', @machine_image.image_location.href
diff --git a/clients/cimi/views/machine_templates/index.haml b/clients/cimi/views/machine_templates/index.haml
index 2a285f1..cb14ac0 100644
--- a/clients/cimi/views/machine_templates/index.haml
+++ b/clients/cimi/views/machine_templates/index.haml
@@ -23,8 +23,8 @@
%h3 Collection details
%dl
- %dt URI
- %dd=@machine_templates.uri
+ %dt id
+ %dd=@machine_templates.id
%dt Description
%dd=@machine_templates.description
%dt Created
diff --git a/clients/cimi/views/machine_templates/show.haml b/clients/cimi/views/machine_templates/show.haml
index 9386437..1bfe803 100644
--- a/clients/cimi/views/machine_templates/show.haml
+++ b/clients/cimi/views/machine_templates/show.haml
@@ -19,10 +19,10 @@
Providers discretion, be created by Consumers.
%dl
- %dt URI
+ %dt id
%dd
- %a{ :href => @machine_template.uri }=@machine_template.uri
+ %a{ :href => @machine_template.id }=@machine_template.id
%dt Description
%dd=@machine_template.description
%dt Created
- %dd #{@machine_template.created}
\ No newline at end of file
+ %dd #{@machine_template.created}
diff --git a/clients/cimi/views/machines/index.haml b/clients/cimi/views/machines/index.haml
index 735bd2c..ba9212c 100644
--- a/clients/cimi/views/machines/index.haml
+++ b/clients/cimi/views/machines/index.haml
@@ -10,10 +10,10 @@
- content_for :actions do
%p
- %a{ :href => "#{@machines.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@machines.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@machines.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@machines.id}?format=json", :class => 'label warning' } JSON
%p
- %a{ :href => '#machineModal', :class => 'btn btn-primary', :'data-toggle' => :modal} New Machine
+ %a{ :href => '#machineModal', :class => 'btn btn-primary', :'data-toggle' => :modal} New Machine
%div{ :id => :machineModal, :class => 'modal hide fade' }
.modal-header
@@ -67,6 +67,6 @@
- details('Collection details') do
- - row 'URI', @machines.uri
+ - row 'ID', @machines.id
- row 'Description', @machines.description
- row 'Created', @machines.created
diff --git a/clients/cimi/views/machines/show.haml b/clients/cimi/views/machines/show.haml
index 26deb9e..24f86d8 100644
--- a/clients/cimi/views/machines/show.haml
+++ b/clients/cimi/views/machines/show.haml
@@ -13,8 +13,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@machine.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@machine.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@machine.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@machine.id}?format=json", :class => 'label warning' } JSON
%p
- if @machine.state == 'STARTED'
%form{ :action => "/cimi/machines/#{@machine.name}/stop", :method => :post, :style => 'display:inline'}
@@ -35,7 +35,7 @@
%tr
%th ID
%td
- %a{ :href => @machine.uri }=@machine.uri
+ %a{ :href => @machine.id }=@machine.id
%tr
%th Description
%td=@machine.description
diff --git a/clients/cimi/views/network_configurations/index.haml b/clients/cimi/views/network_configurations/index.haml
index 155baca..9b7a370 100644
--- a/clients/cimi/views/network_configurations/index.haml
+++ b/clients/cimi/views/network_configurations/index.haml
@@ -9,8 +9,8 @@
NetworkConfigurationCollection
- content_for :actions do
%p
- %a{ :href => "#{@network_configs.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@network_configs.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@network_configs.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@network_configs.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -26,8 +26,8 @@
%h3 Collection details
%dl
- %dt URI
- %dd=@network_configs.uri
+ %dt id
+ %dd=@network_configs.id
%dt Description
%dd=@network_configs.description
%dt Created
diff --git a/clients/cimi/views/network_configurations/show.haml b/clients/cimi/views/network_configurations/show.haml
index 676ee9c..e35952e 100644
--- a/clients/cimi/views/network_configurations/show.haml
+++ b/clients/cimi/views/network_configurations/show.haml
@@ -13,8 +13,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@network_config.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@network_config.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@network_config.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@network_config.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -22,9 +22,9 @@
the information needed to create a Network with certain characteristics.
%dl
- %dt URI
+ %dt id
%dd
- %a{ :href => @network_config.uri }=@network_config.uri
+ %a{ :href => @network_config.id }=@network_config.id
%dt Description
%dd=@network_config.description
%dt Created
diff --git a/clients/cimi/views/networks/index.haml b/clients/cimi/views/networks/index.haml
index 699ebf8..75d80ee 100644
--- a/clients/cimi/views/networks/index.haml
+++ b/clients/cimi/views/networks/index.haml
@@ -10,8 +10,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@networks.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@networks.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@networks.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@networks.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -26,8 +26,8 @@
%h3 Collection details
%dl
- %dt URI
- %dd=@networks.uri
+ %dt id
+ %dd=@networks.id
%dt Description
%dd=@networks.description
%dt Created
diff --git a/clients/cimi/views/networks/show.haml b/clients/cimi/views/networks/show.haml
index 111254a..44bca74 100644
--- a/clients/cimi/views/networks/show.haml
+++ b/clients/cimi/views/networks/show.haml
@@ -13,8 +13,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@network.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@network.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@network.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@network.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -22,9 +22,9 @@
that represents an abstraction of a layer 2 broadcast domain.
%dl
- %dt URI
+ %dt id
%dd
- %a{ :href => @network.uri }=@network.uri
+ %a{ :href => @network.id }=@network.id
%dt Description
%dd=@network.description
%dt Created
diff --git a/clients/cimi/views/volume_configurations/index.haml b/clients/cimi/views/volume_configurations/index.haml
index 88ed9c8..71af308 100644
--- a/clients/cimi/views/volume_configurations/index.haml
+++ b/clients/cimi/views/volume_configurations/index.haml
@@ -9,8 +9,8 @@
VolumeConfigurationCollection
- content_for :actions do
%p
- %a{ :href => "#{@volume_configurations.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@volume_configurations.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@volume_configurations.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@volume_configurations.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
diff --git a/clients/cimi/views/volume_configurations/show.haml b/clients/cimi/views/volume_configurations/show.haml
index 1e55473..2465423 100644
--- a/clients/cimi/views/volume_configurations/show.haml
+++ b/clients/cimi/views/volume_configurations/show.haml
@@ -13,8 +13,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@volume_configuration.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@volume_configuration.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@volume_configuration.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@volume_configuration.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -24,9 +24,9 @@
Providers discretion, be created by Consumers.
%dl
- %dt URI
+ %dt id
%dd
- %a{ :href => @volume_configuration.uri }=@volume_configuration.uri
+ %a{ :href => @volume_configuration.id }=@volume_configuration.id
%dt Description
%dd=@volume_configuration.description
%dt Created
diff --git a/clients/cimi/views/volume_images/index.haml b/clients/cimi/views/volume_images/index.haml
index 2fb5826..8a36205 100644
--- a/clients/cimi/views/volume_images/index.haml
+++ b/clients/cimi/views/volume_images/index.haml
@@ -10,8 +10,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@volume_images.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@volume_images.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@volume_images.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@volume_images.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -27,8 +27,8 @@
%h3 Collection details
%dl
- %dt URI
- %dd=@volume_images.uri
+ %dt id
+ %dd=@volume_images.id
%dt Description
%dd=@volume_images.description
%dt Created
diff --git a/clients/cimi/views/volume_images/show.haml b/clients/cimi/views/volume_images/show.haml
index f76bf5e..d0257d7 100644
--- a/clients/cimi/views/volume_images/show.haml
+++ b/clients/cimi/views/volume_images/show.haml
@@ -13,8 +13,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@volume_image.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@volume_image.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@volume_image.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@volume_image.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -22,9 +22,9 @@
resources to create a Volume Instance
%dl
- %dt URI
+ %dt id
%dd
- %a{ :href => @volume_image.uri }=@volume_image.uri
+ %a{ :href => @volume_image.id }=@volume_image.id
%dt Description
%dd=@volume_image.description
%dt Created
diff --git a/clients/cimi/views/volumes/index.haml b/clients/cimi/views/volumes/index.haml
index 08a5cc1..dc1b631 100644
--- a/clients/cimi/views/volumes/index.haml
+++ b/clients/cimi/views/volumes/index.haml
@@ -10,8 +10,8 @@
- content_for :actions do
%p
- %a{ :href => "#{@volumes.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@volumes.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@volumes.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@volumes.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
@@ -26,7 +26,7 @@
%a{ :href => "/cimi/volumes/#{volume.href.split('/').last}"}=volume.href.split('/').last
- details 'Collection details' do
- - row 'URI', @volumes.uri
+ - row 'ID', @volumes.id
- row 'Description', @volumes.description
- row 'Created', @volumes.created
diff --git a/clients/cimi/views/volumes/show.haml b/clients/cimi/views/volumes/show.haml
index ae477db..9046402 100644
--- a/clients/cimi/views/volumes/show.haml
+++ b/clients/cimi/views/volumes/show.haml
@@ -13,15 +13,15 @@
- content_for :actions do
%p
- %a{ :href => "#{@volume.uri}?format=xml", :class => 'label warning' } XML
- %a{ :href => "#{@volume.uri}?format=json", :class => 'label warning' } JSON
+ %a{ :href => "#{@volume.id}?format=xml", :class => 'label warning' } XML
+ %a{ :href => "#{@volume.id}?format=json", :class => 'label warning' } JSON
%blockquote
%p
This entity represents a volume Instance
- details 'Volume details' do
- - row 'URI', @volume.uri
+ - row 'ID', @volume.id
- row 'Description', @volume.description
- row 'Created', @volume.created
- row 'Bootable?', boolean_span_for(@volume.bootable)
--
1.7.6.5