deltacloud-core 1.1.0 → 1.1.1

data/Rakefile

@@ -146,8 +146,8 @@ task :test do
   Rake::Task["mock:fixtures:reset"].invoke
   puts "\n[ \033[1;37;mrake test:ec2\33[0m ]\n"
   Rake::Task["test:ec2"].invoke
-  puts "\n[ \033[1;37;mrake test:cimi:models\33[0m ]\n"
-  Rake::Task["test:cimi:models"].invoke
+  puts "\n[ \033[1;37;mrake test:cimi\33[0m ]\n"
+  Rake::Task["test:cimi"].invoke
   DRIVERS.each do |driver|
     puts "\n[ \033[1;37;mrake drivers:#{driver}\33[0m ]\n"
     Rake::Task["test:drivers:#{driver}"].invoke
@@ -200,17 +200,15 @@ namespace :test do
     ]
   end
 
-  namespace :cimi do
-    Rake::TestTask.new(:models) do |t|
-      unless RUBY_VERSION < '1.9.0'
-        t.loader = :testrb
-      end
-      t.test_files = FileList[
-        'tests/cimi/db/*test.rb',            # CIMI frontend database tests
-        'tests/cimi/model/*spec.rb',            # CIMI frontend serialization API tests
-        'tests/cimi/collections/*test.rb',      # CIMI frontend API tests
-      ]
+  Rake::TestTask.new(:cimi) do |t|
+    unless RUBY_VERSION < '1.9.0'
+      t.loader = :testrb
     end
+    t.test_files = FileList[
+      'tests/cimi/db/*test.rb',     # CIMI frontend database tests
+      'tests/cimi/model/*spec.rb',  # CIMI frontend serialization API tests
+      'tests/cimi/collections/*test.rb',   # CIMI frontend API tests
+    ]
   end
 
 end

data/config/drivers/{aruba.yaml → arubacloud.yaml}

@@ -1,8 +1,8 @@
 ---
-:aruba:
+:arubacloud:
   :entrypoints:
     compute:
       dc1: https://api.dc1.computing.cloud.it/WsEndUser/v2.0/WsEndUser.svc?wsdl
       dc2: https://api.dc2.computing.cloud.it/WsEndUser/v2.0/WsEndUser.svc?wsdl
       dc3: https://api.dc3.computing.cloud.it/WsEndUser/v2.0/WsEndUser.svc?wsdl
-  :name: Aruba
+  :name: Arubacloud

data/deltacloud-core.gemspec

@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
   s.add_dependency('sinatra-rabbit', '>= 1.0.11')
   s.add_dependency('rack', '>= 1.0.0')
   s.add_dependency('rack-accept')
-  s.add_dependency('json', '>= 1.1.9')
+  s.add_dependency('json_pure', '>= 1.5.0')
   s.add_dependency('net-ssh', '>= 2.0.0')
   s.add_dependency('nokogiri', '>= 1.4.3')
   s.add_dependency('require_relative') if RUBY_VERSION < '1.9'
@@ -89,10 +89,10 @@ Gem::Specification.new do |s|
   # dependencies for various cloud providers:
 
   # RHEV-M and oVirt
-  s.add_dependency('rbovirt', '>=0.0.16')
+  s.add_dependency('rbovirt', '>=0.0.17')
 
   # Amazon EC2 S3
-  s.add_dependency('aws', '>=2.6.0')
+  s.add_dependency('aws', '>=2.7.0')
   # Microsoft Azure
   s.add_dependency('waz-storage', '>=1.1.0')
 
@@ -111,7 +111,7 @@ Gem::Specification.new do |s|
   s.add_dependency('uuidtools', '>= 2.1.1')
 
   # Openstack Compute and Object-Storage
-  s.add_dependency('openstack', '>= 1.0.7')
+  s.add_dependency('openstack', '>= 1.0.9')
 
   # Aruba Cloud
   s.add_dependency('savon', '>= 1.0.0')

data/lib/cimi/collections/address_templates.rb

@@ -23,7 +23,7 @@ module CIMI::Collections
       operation :index do
         description 'List all AddressTemplates in the AddressTemplateCollection'
         control do
-          address_templates = AddressTemplate.list(self).filter_by(params['$select'])
+          address_templates = AddressTemplate.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml {address_templates.to_xml}
             format.json {address_templates.to_json}

data/lib/cimi/collections/addresses.rb

@@ -20,12 +20,12 @@ module CIMI::Collections
 
     collection :addresses do
 
-      description 'An Address represents an IP address, and its associated metdata, for a particular Network.'
+      description 'An Address represents an IP address, and its associated metadata, for a particular Network.'
 
       operation :index, :with_capability => :addresses do
         description 'List all Addresses in the AddressCollection'
         control do
-          addresses = Address.list(self).filter_by(params['$select'])
+          addresses = Address.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml {addresses.to_xml}
             format.json {addresses.to_json}

data/lib/cimi/collections/base.rb

@@ -43,6 +43,7 @@ module CIMI::Collections
     set :views, root + '/views/cimi'
     set :public_folder, root + '/public'
     set :documentation_class, CIMI
+    set :haml, :format => :xhtml
 
     error do
       report_error

data/lib/cimi/collections/credentials.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
       operation :index, :with_capability => :keys do
         description "List all machine admins"
         control do
-          credentials = Credential.list(self).filter_by(params['$select'])
+          credentials = Credential.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { credentials.to_xml }
             format.json { credentials.to_json }

data/lib/cimi/collections/forwarding_group_templates.rb

@@ -22,7 +22,7 @@ module CIMI::Collections
       operation :index, :with_capability => :forwarding_groups do
         description 'List all ForwardingGroupTemplates in the ForwardingGroupTemplateCollection'
         control do
-          forwarding_group_templates = ForwardingGroupTemplate.list(self).filter_by(params['$select'])
+          forwarding_group_templates = ForwardingGroupTemplate.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml {forwarding_group_templates.to_xml}
             format.json {forwarding_group_templates.to_json}

data/lib/cimi/collections/forwarding_groups.rb

@@ -22,7 +22,7 @@ module CIMI::Collections
       operation :index, :with_capability => :forwarding_groups do
         description 'List all ForwardingGroups in the ForwardingGroupsCollection'
         control do
-          forwarding_groups = ForwardingGroup.list(self).filter_by(params['$select'])
+          forwarding_groups = ForwardingGroup.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml {forwarding_groups.to_xml}
             format.json {forwarding_groups.to_json}

data/lib/cimi/collections/machine_configurations.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
       operation :index, :with_capability => :hardware_profiles do
         description "List all machine configurations"
         control do
-          machine_configs = MachineConfiguration.list(self).filter_by(params['$select'])
+          machine_configs = MachineConfiguration.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { machine_configs.to_xml }
             format.json { machine_configs.to_json }

data/lib/cimi/collections/machine_images.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
       operation :index, :with_capability => :images do
         description "List all machine configurations"
         control do
-          machine_images = MachineImage.list(self).filter_by(params['$select'])
+          machine_images = MachineImage.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { machine_images.to_xml }
             format.json { machine_images.to_json }

data/lib/cimi/collections/machine_templates.rb

@@ -23,7 +23,7 @@ module CIMI::Collections
       operation :index do
         description "List all machine templates"
         control do
-          machine_templates = CIMI::Model::MachineTemplate.list(self).filter_by(params['$select'])
+          machine_templates = CIMI::Model::MachineTemplate.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { machine_templates.to_xml }
             format.json { machine_templates.to_json }

data/lib/cimi/collections/machines.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
       operation :index, :with_capability => :instances do
         description "List all machines"
         control do
-          machines = Machine.list(self).filter_by(params['$select'])
+          machines = Machine.list(self).select_by(params['$select']).filter_by(params['$filter'])
           respond_to do |format|
             format.xml { machines.to_xml }
             format.json { machines.to_json }
@@ -85,7 +85,7 @@ module CIMI::Collections
       end
 
       action :restart, :with_capability => :reboot_instance do
-        description "Start specific machine."
+        description "Restart specific machine."
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)

data/lib/cimi/collections/network_configurations.rb

@@ -23,7 +23,7 @@ module CIMI::Collections
       operation :index, :with_capability => :network_configurations do
         description 'List all NetworkConfigurations'
         control do
-          network_configurations = NetworkConfiguration.list(self).filter_by(params['$select'])
+          network_configurations = NetworkConfiguration.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { network_configurations.to_xml  }
             format.json { network_configurations.to_json }

data/lib/cimi/collections/network_port_configurations.rb

@@ -23,7 +23,7 @@ module CIMI::Collections
       operation :index, :with_capability => :network_port_configurations do
         description 'List all NetworkPortConfigurations in the NetworkPortConfigurationCollection'
         control do
-          net_port_configs = NetworkPortConfiguration.list(self).filter_by(params['$select'])
+          net_port_configs = NetworkPortConfiguration.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml {net_port_configs.to_xml}
             format.json {net_port_configs.to_json}

data/lib/cimi/collections/network_port_templates.rb

@@ -25,7 +25,7 @@ module CIMI::Collections
       operation :index, :with_capability => :network_port_templates do
         description 'List all NetworkPortTemplates in the NetworkPortTemplateCollection'
         control do
-          network_port_templates = NetworkPortTemplate.list(self).filter_by(params['$select'])
+          network_port_templates = NetworkPortTemplate.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml {network_port_templates.to_xml}
             format.json {network_port_templates.to_json}

data/lib/cimi/collections/network_ports.rb

@@ -25,7 +25,7 @@ module CIMI::Collections
       operation :index, :with_capability => :network_ports do
         description 'List all NetworkPorts in the NetworkPortCollection'
         control do
-          network_ports = NetworkPort.list(self).filter_by(params['$select'])
+          network_ports = NetworkPort.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml {network_ports.to_xml}
             format.json {network_ports.to_json}

data/lib/cimi/collections/network_templates.rb

@@ -23,7 +23,7 @@ module CIMI::Collections
       operation :index, :with_capability => :network_templates do
         description 'List all Network Templates in the NetworkTemplateCollection'
         control do
-          network_templates = NetworkTemplate.list(self).filter_by(params['$select'])
+          network_templates = NetworkTemplate.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml {network_templates.to_xml}
             format.json {network_templates.to_json}

data/lib/cimi/collections/networks.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
       operation :index, :with_capability => :networks do
         description "List all Networks"
         control do
-          networks = Network.list(self).filter_by(params['$select'])
+          networks = Network.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { networks.to_xml }
             format.json { networks.to_json }

data/lib/cimi/collections/volume_configurations.rb

@@ -23,7 +23,7 @@ module CIMI::Collections
       operation :index, :with_capability => :storage_volumes do
         description "Get list all VolumeConfigurations"
         control do
-          volume_configuration = VolumeConfiguration.list(self).filter_by(params['$select'])
+          volume_configuration = VolumeConfiguration.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { volume_configuration.to_xml }
             format.json { volume_configuration.to_json }

data/lib/cimi/collections/volume_images.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
       operation :index, :with_capability => :storage_snapshots do
         description "List all volumes images"
         control do
-          volume_images = VolumeImage.list(self).filter_by(params['$select'])
+          volume_images = VolumeImage.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { volume_images.to_xml }
             format.json { volume_images.to_json }

data/lib/cimi/collections/volume_templates.rb

@@ -23,7 +23,7 @@ module CIMI::Collections
       operation :index, :with_capability => :storage_volumes do
         description "Retrieve the Volume Template Collection"
         control do
-          volume_template = VolumeTemplate.list(self).filter_by(params['$select'])
+          volume_template = VolumeTemplate.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { volume_template.to_xml }
             format.json { volume_template.to_json }

data/lib/cimi/collections/volumes.rb

@@ -23,7 +23,7 @@ module CIMI::Collections
       operation :index, :with_capability => :storage_volumes do
         description "List all volumes"
         control do
-          volumes = Volume.list(self).filter_by(params['$select'])
+          volumes = Volume.list(self).select_by(params['$select'])
           respond_to do |format|
             format.xml { volumes.to_xml }
             format.json { volumes.to_json }

data/lib/cimi/helpers/database_helper.rb

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
 module Deltacloud
   module Helpers
 
@@ -18,25 +33,6 @@ module Deltacloud
        return false
      end
 
-      def load_attributes_for(model)
-        return {} if test_environment?
-        entity = get_entity(model)
-        entity.nil? ? {} : entity.to_hash
-      end
-
-      def delete_attributes_for(model)
-        return if test_environment?
-        entity = get_entity(model)
-        !entity.nil? && entity.destroy
-      end
-
-      def get_entity(model)
-        current_db.entities_dataset.first(
-          :be_kind => model.to_entity,
-          :be_id => model.id
-        )
-      end
-
       def current_provider
         Thread.current[:provider] || ENV['API_PROVIDER'] || 'default'
       end
@@ -46,49 +42,8 @@ module Deltacloud
       #
 
       def current_db
-        Deltacloud::Database::Provider.find_or_create(:driver => driver_symbol.to_s, :url => current_provider)
-      end
-
-      def store_attributes_for(model, attrs={})
-        return if test_environment? or model.nil? or attrs.empty?
-        return if model.id.nil?
-
-        unless entity = get_entity(model)
-          entity = Deltacloud::Database::Entity.new(
-            :provider_id => current_db.id,
-            :be_id => model.id,
-            :be_kind => model.to_entity
-          )
-        end
-
-        entity.description = extract_attribute_value('description', attrs) if attrs.has_key? 'description'
-        entity.name = extract_attribute_value('name', attrs) if attrs.has_key? 'name'
-
-        if attrs.has_key? 'properties'
-          entity.ent_properties = extract_attribute_value('properties', attrs).to_json
-        elsif attrs.has_key? 'property'
-          entity.ent_properties = extract_attribute_value('property', attrs).to_json
-        end
-
-        entity.exists? ? entity.save_changes : entity.save
-
-        entity
+        Deltacloud::Database::Provider.lookup
       end
-
-      # In XML serialization the values stored in attrs are arrays, dues to
-      # XmlSimple. This method will help extract values from them
-      #
-      def extract_attribute_value(name, attrs={})
-        return unless attrs[name]
-        if name == 'property'
-          attrs[name].is_a?(Array) ?
-            attrs[name].inject({}) { |r, v| r[v['key']] = v['content']; r} :
-            attrs[name]
-        else
-          attrs[name].is_a?(Array) ? attrs[name].first : attrs[name]
-        end
-      end
-
     end
   end
 

data/lib/cimi/helpers/filter_helper.rb

@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+module CIMI
+  module Helpers
+    module FilterResourceMethods
+
+      def filter_by(filter_opts)
+        return self if filter_opts.nil?
+        return self unless kind_of? CIMI::Model::Collection
+        attribute, value = parse_filter_opts(filter_opts)
+        if attribute =~ /\!$/
+          attribute.chomp!('!')
+          self.entries.delete_if { |entry| entry[attribute.to_sym] == value }
+        else
+          self.entries.delete_if { |entry| entry[attribute.to_sym] != value }
+        end
+        self
+      end
+
+      def parse_filter_opts(opts)
+        attribute, value = opts.split('=')
+        value.gsub!(/\A("|')|("|')\Z/, '')
+        [attribute, value]
+      end
+
+    end
+  end
+end

data/lib/cimi/helpers/select_helper.rb

@@ -0,0 +1,62 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+module CIMI
+  module Helpers
+    module SelectResourceMethods
+
+      def select_by(filter_opts)
+        return self if filter_opts.nil?
+        return self unless kind_of? CIMI::Model::Collection
+        if filter_opts.include? ','
+          return select_attributes(filter_opts.split(',').map{ |a| a.intern })
+        end
+        case filter_opts
+        when /^([\w\_]+)$/ then select_attributes([$1.intern])
+        when /^([\w\_]+)\[(\d+\-\d+)\]$/ then select_by_arr_range($1.intern, $2)
+        when /^([\w\_]+)\[(\d+)\]$/ then select_by_arr_index($1.intern, $2)
+        else self
+        end
+      end
+
+      def select_by_arr_index(attr, filter)
+        return self unless self.respond_to?(attr)
+        self.class.new(attr => [self.send(attr)[filter.to_i]])
+      end
+
+      def select_by_arr_range(attr, filter)
+        return self unless self.respond_to?(attr)
+        filter = filter.split('-').inject { |s,e| s.to_i..e.to_i }
+        self.class.new(attr => self.send(attr)[filter])
+      end
+
+    end
+
+    module SelectBaseMethods
+      def select_attributes(attr_list)
+        attrs = attr_list.inject({}) do |result, attr|
+          attr = attr.to_s.underscore
+          result[attr.to_sym] = self.send(attr) if self.respond_to?(attr)
+          result
+        end
+        self.class.new(attrs.merge(
+          :select_attr_list => attr_list,
+          :base_id => self.send(:id)
+        ))
+      end
+    end
+
+  end
+end