deltacloud-core 0.4.1 → 0.5.0

data/views/cimi/machines/show.html.haml

@@ -0,0 +1,177 @@
+%h1 View/Edit machine
+
+%form{ :action => machines_url }
+  %input{ :name => :id, :type => :hidden, :value => @dmtfitem["uri"] }/
+  %input{ :name => :xmlRootNode, :type => :hidden, :value => @xml_root_node }/
+  %input{ :name => :refreshURI, :type => :hidden, :value => machines_url }/
+  %p
+    %label
+      Name:
+  %p
+    %input{ :name => :name, :size => 50, :value => @dmtfitem["name"], :style => "width:50%;" }
+    %input{ :name => :created, :type => :hidden, :size => 50, :value => @dmtfitem["created"] }
+  %p
+  %br
+    %label
+      Description:
+  %p
+    %textarea{ :name => :description, :cols => 50, :rows => 4, :style => "width:50%;" } #{@dmtfitem['description']}
+  %p
+  %br
+    %label
+      Properties:
+  %p
+    %table{ :style => "width:50%;", :id => "propertyTable"}
+      - if @dmtfitem["property"]
+        - if @dmtfitem["property"]["name"] && @dmtfitem["property"]["content"]
+          - property_object = {"#{@dmtfitem['property']['name']}" => {"content" => @dmtfitem["property"]["content"]}}
+        - else
+          - property_object = @dmtfitem["property"]
+
+        - iter = -1
+        - property_object.each_pair do |key, value|
+          - iter += 1
+          %tr
+            %td
+              %input{ :name => "param_name_" + iter.to_s, :size => 25, :value => key }
+            %td
+              %input{ :name => "param_value_" + iter.to_s, :size => 25, :value => value["content"] }
+            %td
+              %input{ :type => :button, :value => "Remove", :onClick => "return removeProperty(this)" }
+    %input{ :type => :button, :name => "commit", :value => "Add new property", :onClick => "return AddNewPproperty('propertyTable')" }
+  %p
+  %br
+    %label
+      Status:
+  %p
+    %input{ :name => :status, :size => 50, :value => @dmtfitem["status"], :style => "width:50%;" }
+  %p
+  %br
+    %label
+      CPU:
+  %p
+    %input{ :name => :cpu, :size => 50, :value => @dmtfitem["cpu"], :style => "width:50%;" }
+  %br
+    %label
+      Memory:
+  %p
+    %input{ :name => :memory_quantity, :size => 20, :value => @dmtfitem["memory"]["quantity"], :style => "width:10%;" }      
+    %input{ :name => :memory_units, :size => 20, :value => @dmtfitem["memory"]["units"], :style => "width:10%;" }
+  %br
+    %label
+      Disk:
+  %p
+    %table{ :style => "width:50%;", :id => "diskTable"}
+      - if @dmtfitem["disk"]
+        - if @dmtfitem["disk"].kind_of?(Array)
+          - property_object = @dmtfitem["disk"]
+        - else
+          - property_object = [@dmtfitem["disk"]]
+
+        - iter = -1
+        %tr
+          %td
+            %label
+              Quantity
+          %td
+            %label
+              Units
+          %td
+            %label
+              GuestInterface
+          %td  
+        - property_object.each do |disk|
+          - iter += 1
+          %tr
+            %td
+              %input{ :name => "disk_quantity_" + iter.to_s, :size => 10, :value => disk["capacity"]["quantity"] }
+            %td
+              %input{ :name => "disk_units_" + iter.to_s, :size => 10, :value => disk["capacity"]["units"] }
+            %td
+              %input{ :name => "disk_guestInterface_" + iter.to_s, :size => 20, :value => disk["guestInterface"] }
+            %td
+              %input{ :type => :button, :value => "Remove", :onClick => "return removeProperty(this)" }
+    %input{ :type => :button, :name => "commit", :value => "Add new disk", :onClick => "return addDiskRow('diskTable')" }
+
+  %br
+  %label
+    EntityMetadata:
+  %br
+    %label
+      TODO Need to handle volumes:
+  %p
+  %br
+    %label
+      TODO Need to handle network interfaces:
+
+:javascript
+  function fixupXml(theNode) {
+    var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += getStandardData(theNode);
+    xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
+    xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value + "' units='";
+    xmlData += $(theNode.form).attr("memory_units").value + "' />"
+
+    var index=0;
+    subDisk = ""
+    while ($(theNode.form).attr("disk_quantity_" + index)) {
+      if ($(theNode.form).attr("disk_quantity_" + index).value != null &&
+          $(theNode.form).attr("disk_quantity_" + index).value.length > 0) {
+        subDisk += "<capacity quantity='" + $(theNode.form).attr("disk_quantity_" + index).value + "' units='" +
+                   $(theNode.form).attr("disk_units_" + index).value + "' />";
+        subDisk += "<guestInterface>" + $(theNode.form).attr("disk_guestInterface_" + index).value + "</guestInterface>";
+      }
+      index++;
+    }
+    if (subDisk.length > 0) {
+      xmlData += "<disk>" + subDisk +  "</disk>";
+    }
+
+    //we handle entityMetadata here
+    if ($(theNode.form).attr("entityMetadata").value) {
+      xmlData += $(theNode.form).attr("entityMetadata").value
+    }
+
+    xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
+
+    return xmlData;
+  }
+
+  function addDiskRow(tableId) {
+    var tbl = document.getElementById(tableId);
+    var lastRow = tbl.rows.length;
+    // if there's no header row in the table, then iteration = lastRow + 1
+    var iteration = lastRow - 1;
+    var row = tbl.insertRow(lastRow);
+
+    elNames = ['disk_quantity_', 'disk_units_', 'disk_guestInterface_'];
+    elSizes = [10, 10, 20]
+    elValues = ["200", "megabyte", ""]
+
+    for (var index=0; index<elNames.length; index++) {
+       var aCellTD = row.insertCell(index);
+       var aCell = document.createElement('input');
+       aCell.type = 'text';
+       aCell.name = elNames[index] + iteration;
+       aCell.id = aCell.name;
+       aCell.size = elSizes[index];
+       aCell.value = elValues[index];
+       aCellTD.appendChild(aCell);
+    }
+
+    // select cell
+    var cellRightBut = row.insertCell(elNames.length);
+    var er = document.createElement('input');
+    er.type = 'button';
+    er.name = 'param_remove' + iteration;
+    er.id = 'param_remove' + iteration;
+    er.value = "Remove";
+    er.tableRow = row
+    $(er).click(function() {
+     removeProperty(this);
+    })
+
+    cellRightBut.appendChild(er);
+
+  }

data/views/cimi/machines/show.xml.haml

@@ -0,0 +1,28 @@
+- unless defined?(partial)
+  !!! XML
+%Machine{ :xmlns => CMWG_NAMESPACE }
+  %uri=machines_url + "/" + @dmtfitem["uri"]
+  %name=@dmtfitem["name"]
+  %description=@dmtfitem["description"]
+  %created=@dmtfitem["created"]
+  - if @dmtfitem["property"]
+    - if @dmtfitem["property"]["name"] && @dmtfitem["property"]["content"]
+      - property_object = {"#{@dmtfitem['property']['name']}" => {"content" => @dmtfitem["property"]["content"]}}
+    - else
+      - property_object = @dmtfitem["property"]
+    - property_object.each_pair do |key, value|
+      %property{ :name => key}=value["content"]
+  %status=@dmtfitem["status"]
+  %cpu=@dmtfitem["cpu"]
+  %memory{ :quantity => @dmtfitem["memory"]["quantity"], :units => @dmtfitem["memory"]["units"] }
+  - if @dmtfitem["disk"]
+    - if @dmtfitem["disk"].kind_of?(Array)
+      - property_object = @dmtfitem["disk"]
+    - else
+      - property_object = [@dmtfitem["disk"]]
+    - property_object.each do |disk|
+      %disk
+        %capacity{ :quantity => disk["capacity"]["quantity"], :units => disk["capacity"]["units"] }
+        %guestInterface= disk["guestInterface"]
+  %operation{ :rel => "edit", :href => machines_url + "/" + @dmtfitem["uri"] }
+  %operation{ :rel => "delete", :href => machines_url + "/" + @dmtfitem["uri"] }

data/views/cimi/volumes/show.html.haml

@@ -0,0 +1,68 @@
+%h1 View/Edit volume
+
+%form{ :action => volumes_url }
+  %input{ :name => :id, :type => :hidden, :value => @dmtfitem["uri"] }/
+  %input{ :name => :xmlRootNode, :type => :hidden, :value => @xml_root_node }/
+  %input{ :name => :refreshURI, :type => :hidden, :value => volumes_url }/
+  %p
+    %label
+      Name:
+  %p
+    %input{ :name => :name, :size => 50, :value => @dmtfitem["name"], :style => "width:50%;" }
+    %input{ :name => :created, :type => :hidden, :size => 50, :value => @dmtfitem["created"] }
+  %p
+  %br
+    %label
+      Description:
+  %p
+    %textarea{ :name => :description, :cols => 50, :rows => 4, :style => "width:50%;" } #{@dmtfitem['description']}
+  %p
+  %br
+    %label
+      Properties:
+  %p
+    %table{ :style => "width:50%;", :id => "propertyTable"}
+      - if @dmtfitem["property"]
+        - if @dmtfitem["property"]["name"] && @dmtfitem["property"]["content"]
+          - property_object = {"#{@dmtfitem['property']['name']}" => {"content" => @dmtfitem["property"]["content"]}}
+        - else
+          - property_object = @dmtfitem["property"]
+
+        - iter = -1
+        - property_object.each_pair do |key, value|
+          - iter += 1
+          %tr
+            %td
+              %input{ :name => "param_name_" + iter.to_s, :size => 30, :value => key }
+            %td
+              %input{ :name => "param_value_" + iter.to_s, :size => 30, :value => value["content"] }
+            %td
+              %input{ :type => :button, :value => "Remove", :onClick => "return removeProperty(this)" }
+    %input{ :type => :button, :name => "commit", :value => "Add new property", :onClick => "return AddNewPproperty('propertyTable')" }
+  %p
+  %br
+    %label
+      Capacity:
+  %p
+    %input{ :name => :capacity_quantity, :size => 20, :value => @dmtfitem["capacity"]["quantity"], :style => "width:10%;" }      
+    %input{ :name => :capacity_units, :size => 20, :value => @dmtfitem["capacity"]["units"], :style => "width:10%;" }
+  %br
+  %label
+    EntityMetadata:
+  %br
+
+:javascript
+  function fixupXml(theNode) {
+    var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += getStandardData(theNode);
+    xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
+    xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value + "' units='";
+    xmlData += $(theNode.form).attr("memory_units").value + "' />"
+
+    var index=0;
+
+    xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
+
+    return xmlData;
+  }

data/views/cimi/volumes/show.xml.haml

@@ -0,0 +1,17 @@
+- unless defined?(partial)
+  !!! XML
+%Volume{ :xmlns => CMWG_NAMESPACE }
+  %uri=volumes_url + "/" + @dmtfitem["uri"]
+  %name=@dmtfitem["name"]
+  %description=@dmtfitem["description"]
+  %created=@dmtfitem["created"]
+  - if @dmtfitem["property"]
+    - if @dmtfitem["property"]["name"] && @dmtfitem["property"]["content"]
+      - property_object = {"#{@dmtfitem['property']['name']}" => {"content" => @dmtfitem["property"]["content"]}}
+    - else
+      - property_object = @dmtfitem["property"]
+    - property_object.each_pair do |key, value|
+      %property{ :name => key}=value["content"]
+  %capacity{ :quantity => @dmtfitem["capacity"]["quantity"], :units => @dmtfitem["capacity"]["units"]}
+  %operation{ :rel => "edit", :href => volumes_url + "/" + @dmtfitem["uri"] }
+  %operation{ :rel => "delete", :href => volumes_url + "/" + @dmtfitem["uri"] }

data/views/drivers/show.html.haml

@@ -12,9 +12,14 @@
     %li{ :'data-role' => 'list-divider'} Provider
     %li
       %p{ :'data-role' => 'fieldcontain'}
-        - providers = driver_provider(@driver).keys.collect { |k| k.to_s }.sort
-        - if providers.empty?
-          None
+        - if @providers
+          - @providers.each do |p|
+            %h3= p.id
+            %p= p.url
         - else
-          - providers.each do |k|
-            %p= k
+          - providers = driver_provider(@driver).keys.collect { |k| k.to_s }.sort
+          - if providers.empty?
+            None
+          - else
+            - providers.each do |k|
+              %p= k

data/views/drivers/show.xml.haml

@@ -1,7 +1,12 @@
 %driver{ :href => driver_url(@name), :id => @name }
   %name<
     = @driver[:name]
-  - driver_provider(@driver).each do |prov, details|
-    %provider{ :id => prov }
-      - details.each do |kind, url|
-        %entrypoint{ :kind => kind }<=cdata(url)
+  - if @providers.nil?
+    - driver_provider(@driver).each do |prov, details|
+      %provider{ :id => prov }
+        - details.each do |kind, url|
+          %entrypoint{ :kind => kind }<=cdata(url)
+  - else
+    - @providers.each do |p|
+      %provider{ :id => p.id }
+        %entrypoint{ :kind => p.name }<=p.url

data/views/error.html.haml

@@ -2,11 +2,11 @@
 %html
   %head
     %title Deltacloud API #{settings.version}
-    = stylesheet_link_tag '/stylesheets/jquery.mobile-1.0b1.min.css'
+    = stylesheet_link_tag '/stylesheets/jquery.mobile-1.0rc1.min.css'
     = stylesheet_link_tag '/stylesheets/new.css'
     %script{:type => "text/javascript", :src => "/javascripts/jquery.min.js" }
     %script{:type => "text/javascript", :src => "/javascripts/application.js" }
-    %script{:type => "text/javascript", :src => "/javascripts/jquery.mobile-1.0b1.min.js" }
+    %script{:type => "text/javascript", :src => "/javascripts/jquery.mobile-1.0rc1.min.js" }
     :javascript
       $(document).ready(function() {
         $(document).bind("mobileinit", function(){

data/views/errors/500.xml.haml

@@ -1,5 +1,11 @@
 %error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
   %kind backend_error
-  %backend{ :driver => driver_symbol }
+  %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
     %code=response.status
   %message< #{cdata @error.message}
+  - if @error.respond_to? :backtrace
+    %backtrace=cdata @error.backtrace.join("\n")
+  - if params
+    %request
+      - params.each do |k, v|
+        %param{ :name => k}=v

data/views/instances/index.html.haml

@@ -4,7 +4,7 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     %li{ :'data-role' => 'list-divider'}=driver_symbol
-    - @instances.each do |instance|
+    - @elements.each do |instance|
       %li
         %a{ :href => instance_url(instance.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/machine.png'}

data/views/instances/new.html.haml

@@ -1,5 +1,21 @@
 =header "Launch new instance"
-=subheader @image.description
+=subheader "#{@image.id}"
+
+.hidden_content
+  - @hardware_profiles.each do |profile|
+    %div{ :'data-role' => :fieldcontain, :id => "hwp_properties_#{profile.name}", :class => 'property_block'}
+      - profile.properties.reject { |prop| prop.fixed? }.each do |prop|
+        %label{ :for => "#{prop.param}_#{profile.name}", :class => 'ui-input-text' }=prop.name
+        %span.radio-group-details
+          - if prop.kind == :enum
+            %select{ :size => 1, :name => prop.param }
+              - for v in prop.values
+                %option= v
+                = prop.unit
+          - elsif prop.kind == :range
+            %input{ :type => :range, :value => prop.first, :min => prop.first, :max => prop.last, :name => prop.param}
+          - else
+            %input{ :name => prop.param, :size => 10, :value => "#{prop.default}" }= prop.unit
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
   %form{ :action => instances_url, :method => :post, :class => :new_instance, :'data-ajax' => 'false'}
@@ -59,21 +75,8 @@
         %fieldset{ :'data-role' => :fieldcontain}
           - @hardware_profiles.each do |profile|
             %input{ :type => :radio, :name => 'hwp_id', :value => profile.name, :id => profile.name, :'data-theme' => 'b'}/
-            %label{ :for => profile.name}=profile.name
-            - profile.properties.reject { |prop| prop.fixed? }.each do |prop|
-              %div{ :'data-role' => :fieldcontain}
-                %label{ :for => "#{prop.param}_#{profile.name}" }=prop.name
-                %span.radio-group-details
-                  - if prop.kind == :enum
-                    %select{ :size => 1, :name => prop.param }
-                      - for v in prop.values
-                        %option= v
-                    = prop.unit
-                  - elsif prop.kind == :range
-                    %input{ :type => :range, :value => prop.first, :min => prop.first, :max => prop.last, :name => prop.param}
-                  - else
-                    %input{ :name => prop.param, :size => 10, :value => "#{prop.default}" }
-                    = prop.unit
+            %label{ :for => profile.name, :onclick => "expandHWP('#{profile.name}');"}=profile.name
+            %div{ :'data-role' => :fieldcontain, :id => "property_container_#{profile.name}", :class => 'hwp_properties'}
 
     - if !@realms.empty?
       %div{ 'data-role' => :fieldcontain }

data/views/instances/show.html.haml

@@ -28,10 +28,10 @@
         default
     %li{ :'data-role' => 'list-divider'} Public addresses
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@instance.public_addresses.map.join(',')
+      %p{ :'data-role' => 'fieldcontain'}=@instance.public_addresses.join(',')
     %li{ :'data-role' => 'list-divider'} Private addresses
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@instance.private_addresses.map.join(',')
+      %p{ :'data-role' => 'fieldcontain'}=@instance.private_addresses.join(',')
     - if @instance.password or @instance.keyname
       %li{ :'data-role' => 'list-divider'} Authentication
     - if @instance.password
@@ -46,6 +46,11 @@
     - if @instance.firewalls
       %li{ :'data-role' => 'list-divider'} Firewalls
       %li=@instance.firewalls.join(", ")
+    - if @instance.storage_volumes
+      %li{ :'data-role' => 'list-divider'} Attached Storage Volumes
+      -@instance.storage_volumes.each do |vol|
+        %li
+          %p{ :'data-role' => 'fieldcontain'}="#{vol.keys.first} <---> #{vol.values.first}"
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }

data/views/instances/show.xml.haml

@@ -31,19 +31,20 @@
       =@instance.launch_time
   - if @instance.public_addresses
     %public_addresses<
-      - @instance.public_addresses.each do |address|
-        - if address.class.eql?(Hash) and address[:address]!=""
-          =format_address(address[:address], :port => address[:port], :type => address[:type], :mac => address[:mac])
-        - elsif address.class.eql?(String)
-          =format_address(address)
+      - @instance.public_addresses.each do |a|
+        %address{ :type => a.address_type, :port => a.port }=a.address
   - if @instance.private_addresses
     %private_addresses<
-      - @instance.private_addresses.each do |address|
-        =format_address(address)
+      - @instance.private_addresses.each do |a|
+        %address{ :type => a.address_type, :port => a.port }=a.address
   - if @instance.firewalls
     %firewalls<
       - @instance.firewalls.each do |firewall|
         %firewall{:href => firewall_url(firewall), :id => firewall }
+  - if @instance.storage_volumes
+    %storage_volumes<
+      - @instance.storage_volumes.each do |volume|
+        %storage_volume{:href=> storage_volume_url(volume.keys.first), :id => volume.keys.first, :device => volume.values.first}
   - if driver_has_auth_features?
     %authentication{ :type => driver_auth_feature_name }
       - if @instance.authn_feature_failed?