deltacloud-core 1.0.3 → 1.0.4

data/views/load_balancers/index.html.haml

@@ -1,5 +1,5 @@
 =header "Load balancers" do
-  %a{ :href => api_url_for('load_balancers/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new load balancer
+  %a{ :href => url_for('load_balancers/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new load balancer
 =subheader "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}

data/views/load_balancers/show.html.haml

@@ -20,16 +20,16 @@
       %li
         %a{ :href => instance_url(instance[:id]), :'data-ajax' => 'false'}
           %h3=instance[:name]
-          =link_to_action "UnRegister", api_url_for("load_balancers/#{@load_balancer.id}/unregister?instance_id=#{instance[:id]}"), :post
+          =link_to_action "UnRegister", url_for("load_balancers/#{@load_balancer.id}/unregister?instance_id=#{instance[:id]}"), :post
     %li{ :'data-role' => 'list-divider'} UnRegistered Instances
     - @unregistered_instances.each do |instance|
       %li
         %a{:href => instance_url(instance[:id]), :'data-ajax' => 'false'}
           %h3=instance[:name]
-          =link_to_action "Register", api_url_for("load_balancers/#{@load_balancer.id}/register?instance_id=#{instance[:id]}"), :post
+          =link_to_action "Register", url_for("load_balancers/#{@load_balancer.id}/register?instance_id=#{instance[:id]}"), :post
     %li{ :'data-role' => 'list-divider'} Actions
     %li
-      =link_to_action "Destroy", api_url_for("load_balancers/#{@load_balancer.id}"), :delete
+      =link_to_action "Destroy", url_for("load_balancers/#{@load_balancer.id}"), :delete
 
   =header "Listeners", :back => 'false'
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}

data/views/storage_snapshots/show.html.haml

@@ -19,4 +19,4 @@
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - if driver.respond_to?(:destroy_storage_snapshot)
-          =link_to_action "Delete", api_url_for("storage_snapshots/#{@storage_snapshot.id}"), :delete
+          =link_to_action "Delete", url_for("storage_snapshots/#{@storage_snapshot.id}"), :delete

data/views/storage_volumes/attach.html.haml

@@ -1,6 +1,6 @@
 %h1 Attach storage volume
 
-%form{ :action => api_url_for("storage_volumes/#{params[:id]}/attach"), :method => :post }
+%form{ :action => url_for("storage_volumes/#{params[:id]}/attach"), :method => :post }
   %p
     %label
       Instance ID:

data/views/storage_volumes/index.html.haml

@@ -1,5 +1,5 @@
 =header "Storage volumes" do
-  %a{ :href => api_url_for('storage_volumes/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new volume
+  %a{ :href => url_for('storage_volumes/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new volume
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}

data/views/storage_volumes/show.html.haml

@@ -35,9 +35,9 @@
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - if ["AVAILABLE", "IN-USE"].include?(@storage_volume.state)
-          =link_to_action "Snapshot", api_url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"), :get
+          =link_to_action "Snapshot", url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"), :get
           - unless @storage_volume.instance_id
-            =link_to_action "Delete", api_url_for("storage_volumes/#{@storage_volume.id}"), :delete
-            =link_to_action "Attach", api_url_for("storage_volumes/#{@storage_volume.id}/attach_instance"), :get
+            =link_to_action "Delete", url_for("storage_volumes/#{@storage_volume.id}"), :delete
+            =link_to_action "Attach", url_for("storage_volumes/#{@storage_volume.id}/attach_instance"), :get
           - if @storage_volume.instance_id
-            =link_to_action "Detach", api_url_for("storage_volumes/#{@storage_volume.id}/detach"), :post
+            =link_to_action "Detach", url_for("storage_volumes/#{@storage_volume.id}/detach"), :post

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - The Apache Software Foundation
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-07 00:00:00 Z
+date: 2012-10-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -71,12 +71,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 1
         - 0
-        - 10
-        version: 1.0.10
+        - 11
+        version: 1.0.11
   version_requirements: *id004
   name: sinatra-rabbit
   prerelease: false
@@ -433,73 +433,58 @@ files:
 - support/condor/config/50condor_cloud_node.config
 - support/condor/config/condor-cloud
 - lib/cimi/collections/machine_images.rb
-- lib/cimi/collections/vsps.rb
-- lib/cimi/collections/machine_admins.rb
 - lib/cimi/collections/addresses.rb
-- lib/cimi/collections/routing_group_templates.rb
+- lib/cimi/collections/credentials.rb
 - lib/cimi/collections/network_templates.rb
 - lib/cimi/collections/volume_configurations.rb
-- lib/cimi/collections/vsp_configurations.rb
+- lib/cimi/collections/network_ports.rb
 - lib/cimi/collections/machines.rb
 - lib/cimi/collections/machine_configurations.rb
 - lib/cimi/collections/cloud_entry_point.rb
+- lib/cimi/collections/network_port_templates.rb
 - lib/cimi/collections/volume_images.rb
-- lib/cimi/collections/vsp_templates.rb
+- lib/cimi/collections/forwarding_groups.rb
 - lib/cimi/collections/networks.rb
-- lib/cimi/collections/routing_groups.rb
-- lib/cimi/collections/entity_metadata.rb
+- lib/cimi/collections/network_port_configurations.rb
 - lib/cimi/collections/volumes.rb
 - lib/cimi/collections/network_configurations.rb
+- lib/cimi/collections/resource_metadata.rb
+- lib/cimi/collections/forwarding_group_templates.rb
 - lib/cimi/collections/address_templates.rb
+- lib/cimi/collections/base.rb
 - lib/cimi/models/action.rb
 - lib/cimi/models/network.rb
+- lib/cimi/models/network_port_template_collection.rb
 - lib/cimi/models/address_template.rb
 - lib/cimi/models/disk_collection.rb
-- lib/cimi/models/machine_collection.rb
-- lib/cimi/models/entity_metadata_collection.rb
+- lib/cimi/models/network_port_configuration_collection.rb
 - lib/cimi/models/volume.rb
+- lib/cimi/models/forwarding_group_template.rb
 - lib/cimi/models/machine_template.rb
-- lib/cimi/models/vsp_collection.rb
+- lib/cimi/models/network_port_template.rb
 - lib/cimi/models/errors.rb
-- lib/cimi/models/network_collection.rb
 - lib/cimi/models/disk.rb
-- lib/cimi/models/routing_group_collection.rb
-- lib/cimi/models/vsp_template_collection.rb
+- lib/cimi/models/network_port_collection.rb
+- lib/cimi/models/credential.rb
 - lib/cimi/models/address.rb
-- lib/cimi/models/routing_group_template.rb
 - lib/cimi/models/machine_volume.rb
-- lib/cimi/models/routing_group.rb
-- lib/cimi/models/vsp_configuration.rb
-- lib/cimi/models/volume_image_collection.rb
-- lib/cimi/models/machine_admin_collection.rb
+- lib/cimi/models/collection.rb
 - lib/cimi/models/cloud_entry_point.rb
-- lib/cimi/models/routing_group_template_collection.rb
 - lib/cimi/models/network_template.rb
 - lib/cimi/models/volume_configuration.rb
 - lib/cimi/models/volume_template.rb
-- lib/cimi/models/vsp_configuration_collection.rb
 - lib/cimi/models/machine_image.rb
-- lib/cimi/models/machine_template_collection.rb
-- lib/cimi/models/machine_admin.rb
-- lib/cimi/models/vsp_template.rb
 - lib/cimi/models/network_configuration.rb
 - lib/cimi/models/schema.rb
 - lib/cimi/models/machine.rb
-- lib/cimi/models/entity_metadata.rb
-- lib/cimi/models/network_template_collection.rb
+- lib/cimi/models/network_port_configuration.rb
 - lib/cimi/models/volume_image.rb
-- lib/cimi/models/machine_image_collection.rb
+- lib/cimi/models/network_port.rb
+- lib/cimi/models/forwarding_group.rb
 - lib/cimi/models/machine_volume_collection.rb
-- lib/cimi/models/machine_configuration_collection.rb
-- lib/cimi/models/address_template_collection.rb
-- lib/cimi/models/volume_template_collection.rb
-- lib/cimi/models/network_configuration_collection.rb
-- lib/cimi/models/volume_collection.rb
-- lib/cimi/models/address_collection.rb
-- lib/cimi/models/vsp.rb
+- lib/cimi/models/resource_metadata.rb
 - lib/cimi/models/base.rb
 - lib/cimi/models/machine_configuration.rb
-- lib/cimi/models/volume_configuration_collection.rb
 - lib/cimi/models.rb
 - lib/cimi/server.rb
 - lib/cimi/collections.rb
@@ -520,6 +505,7 @@ files:
 - lib/deltacloud/collections/drivers.rb
 - lib/deltacloud/collections/firewalls.rb
 - lib/deltacloud/collections/realms.rb
+- lib/deltacloud/collections/base.rb
 - lib/deltacloud/models/firewall_rule.rb
 - lib/deltacloud/models/realm.rb
 - lib/deltacloud/models/image.rb
@@ -543,6 +529,7 @@ files:
 - lib/deltacloud/server.rb
 - lib/deltacloud/api.rb
 - lib/deltacloud/core_ext/array.rb
+- lib/deltacloud/core_ext/ordered_hash.rb
 - lib/deltacloud/core_ext/proc.rb
 - lib/deltacloud/core_ext/string.rb
 - lib/deltacloud/core_ext/integer.rb
@@ -554,7 +541,6 @@ files:
 - lib/deltacloud/helpers/driver_helper.rb
 - lib/deltacloud/helpers/blob_stream_helper.rb
 - lib/deltacloud/helpers/deltacloud_helper.rb
-- lib/deltacloud/helpers/url_helper.rb
 - lib/deltacloud/helpers/rabbit_helper.rb
 - lib/deltacloud/helpers.rb
 - lib/deltacloud/runner.rb
@@ -622,6 +608,10 @@ files:
 - lib/deltacloud/drivers/mock/data/storage_snapshots/snap1.yml
 - lib/deltacloud/drivers/mock/data/storage_snapshots/snap3.yml
 - lib/deltacloud/drivers/mock/data/storage_snapshots/snap2.yml
+- lib/deltacloud/drivers/mock/data/addresses/192.168.0.2.yml
+- lib/deltacloud/drivers/mock/data/addresses/192.168.0.3.yml
+- lib/deltacloud/drivers/mock/data/addresses/192.168.0.4.yml
+- lib/deltacloud/drivers/mock/data/addresses/192.168.0.1.yml
 - lib/deltacloud/drivers/mock/data/blobs/blob1.yml
 - lib/deltacloud/drivers/mock/data/blobs/blob2.yml
 - lib/deltacloud/drivers/mock/data/blobs/blob4.yml
@@ -644,14 +634,15 @@ files:
 - tests/cimi/collections/cloud_entry_point_test.rb
 - tests/cimi/collections/machines_test.rb
 - tests/cimi/collections/common.rb
+- tests/cimi/collections/url_helper_test.rb
 - tests/cimi/collections/machine_images_test.rb
 - tests/cimi/spec/cimi/model/machine_template_spec.rb
 - tests/cimi/spec/cimi/model/machine_spec.rb
 - tests/cimi/spec/cimi/model/machine_configuration_spec.rb
 - tests/cimi/spec/cimi/model/volume_configuration_spec.rb
 - tests/cimi/spec/cimi/model/volume_template_spec.rb
-- tests/cimi/spec/cimi/model/machine_admin_spec.rb
 - tests/cimi/spec/cimi/model/volume_spec.rb
+- tests/cimi/spec/cimi/model/credential_spec.rb
 - tests/cimi/spec/cimi/model/volume_image_spec.rb
 - tests/cimi/spec/cimi/model/schema_spec.rb
 - tests/cimi/spec/cimi/model/machine_image_spec.rb
@@ -699,6 +690,7 @@ files:
 - tests/drivers/rhevm/instance_test.rb
 - tests/drivers/rhevm/provider_test.rb
 - tests/drivers/base/common.rb
+- tests/drivers/base/exceptions_test.rb
 - tests/drivers/base/base_driver_test.rb
 - tests/drivers/base/library_test.rb
 - tests/drivers/openstack/images_test.rb
@@ -720,6 +712,7 @@ files:
 - tests/drivers/ec2/realms_test.rb
 - tests/drivers/ec2/instance_test.rb
 - tests/drivers/ec2/storage_snapshots_test.rb
+- tests/drivers/ec2/buckets_test.rb
 - tests/drivers/gogrid/images_test.rb
 - tests/drivers/gogrid/common.rb
 - tests/drivers/gogrid/hardware_profiles_test.rb
@@ -811,6 +804,7 @@ files:
 - views/storage_volumes/index.html.haml
 - views/storage_volumes/show.xml.haml
 - views/storage_volumes/new.html.haml
+- views/index.html.haml
 - views/storage_snapshots/index.xml.haml
 - views/storage_snapshots/show.html.haml
 - views/storage_snapshots/index.html.haml
@@ -938,6 +932,7 @@ summary: Deltacloud REST API
 test_files: 
 - tests/cimi/collections/cloud_entry_point_test.rb
 - tests/cimi/collections/machines_test.rb
+- tests/cimi/collections/url_helper_test.rb
 - tests/cimi/collections/machine_images_test.rb
 - tests/deltacloud/server_test.rb
 - tests/deltacloud/collections/instances_collection_test.rb
@@ -975,6 +970,7 @@ test_files:
 - tests/drivers/rhevm/realms_test.rb
 - tests/drivers/rhevm/instance_test.rb
 - tests/drivers/rhevm/provider_test.rb
+- tests/drivers/base/exceptions_test.rb
 - tests/drivers/base/base_driver_test.rb
 - tests/drivers/base/library_test.rb
 - tests/drivers/openstack/images_test.rb
@@ -993,6 +989,7 @@ test_files:
 - tests/drivers/ec2/realms_test.rb
 - tests/drivers/ec2/instance_test.rb
 - tests/drivers/ec2/storage_snapshots_test.rb
+- tests/drivers/ec2/buckets_test.rb
 - tests/drivers/gogrid/images_test.rb
 - tests/drivers/gogrid/hardware_profiles_test.rb
 - tests/drivers/gogrid/instances_test.rb

data/lib/cimi/models/address_collection.rb

@@ -1,34 +0,0 @@
-# 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.
-
-class CIMI::Model::AddressCollection < CIMI::Model::Base
-
-  act_as_root_entity :address
-
-  array :addresses do
-    scalar :href
-  end
-
-  def self.default(context)
-    self.new(
-      :id => context.addresses_url,
-      :name => 'default',
-      :created => Time.now,
-      :description => "#{context.driver.name.capitalize} AddressCollection",
-      :addresses => CIMI::Model::Address.all(context).map { |addr| { :href => addr.id } }
-    )
-  end
-
-end

data/lib/cimi/models/address_template_collection.rb

@@ -1,34 +0,0 @@
-# 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.
-
-class CIMI::Model::AddressTemplateCollection < CIMI::Model::Base
-
-  act_as_root_entity :address_template
-
-  array :address_templates do
-    scalar :href
-  end
-
-  def self.default(context)
-    self.new(
-      :id => context.address_templates_url,
-      :name => 'default',
-      :created => Time.now,
-      :description => "#{context.driver.name.capitalize} AddressTemplateCollection",
-      :address_templates => CIMI::Model::AddressTemplate.all(context).map { |addr| { :href => addr.id } }
-    )
-  end
-
-end

data/lib/cimi/models/entity_metadata_collection.rb

@@ -1,31 +0,0 @@
-# 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.
-
-class CIMI::Model::EntityMetadataCollection < CIMI::Model::Base
-
-  array :entity_metadata do
-    scalar :href
-  end
-
-  def self.default(context)
-    self.new(
-      :id => context.entity_metadata_url,
-      :name => 'default',
-      :created => Time.now,
-      :entity_metadata => CIMI::Model::EntityMetadata.all_uri(context)
-   )
-  end
-
-end

data/lib/cimi/models/machine_admin_collection.rb

@@ -1,34 +0,0 @@
-# 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.
-
-class CIMI::Model::MachineAdminCollection < CIMI::Model::Base
-
-  act_as_root_entity :machine_admin
-
-  array :machine_admins do
-    scalar :href
-  end
-
-  def self.default(context)
-    self.new(
-      :id => context.machine_admins_url,
-      :name => 'default',
-      :created => Time.now,
-      :description => "#{context.driver.name.capitalize} MachineAdminCollection",
-      :machine_admins => CIMI::Model::MachineAdmin.all_uri(context)
-    )
-  end
-
-end

data/lib/cimi/models/machine_collection.rb

@@ -1,37 +0,0 @@
-# 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.
-
-class CIMI::Model::MachineCollection < CIMI::Model::Base
-
-  act_as_root_entity :machine
-
-  text :count
-
-  #add machines array:
-  self.schema.add_collection_member_array(CIMI::Model::Machine)
-
-  def self.default(context)
-    machines = CIMI::Model::Machine.all(context)
-    self.new(
-      :id => context.machines_url,
-      :name => 'default',
-      :created => Time.now,
-      :description => "#{context.driver.name.capitalize} MachineCollection",
-      :count => machines.size,
-      :machines => machines
-    )
-  end
-
-end