deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dko...@apache.org
Subject [1/3] git commit: CIMI: remove collections that are not part of CIMI 1.x spec
Date Mon, 01 Jul 2013 08:17:38 GMT
Updated Branches:
  refs/heads/master fd92d39d4 -> cab5d6964


CIMI: remove collections that are not part of CIMI 1.x spec


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/b2ad2ee8
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/b2ad2ee8
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/b2ad2ee8

Branch: refs/heads/master
Commit: b2ad2ee8bb5ca6c0cb5f92716eef254b71667aff
Parents: fd92d39
Author: Dies Koper <diesk@fast.au.fujitsu.com>
Authored: Sun Jun 30 21:21:47 2013 +1000
Committer: Dies Koper <diesk@fast.au.fujitsu.com>
Committed: Mon Jul 1 18:16:13 2013 +1000

----------------------------------------------------------------------
 clients/cimi/app.rb                             |  5 ---
 clients/cimi/lib/entities.rb                    |  5 ---
 clients/cimi/lib/entities/routing_group.rb      | 30 ------------------
 .../cimi/lib/entities/routing_group_template.rb | 30 ------------------
 clients/cimi/lib/entities/vsp.rb                | 30 ------------------
 clients/cimi/lib/entities/vsp_configuration.rb  | 30 ------------------
 clients/cimi/lib/entities/vsp_template.rb       | 30 ------------------
 .../views/routing_group_templates/index.haml    | 30 ------------------
 .../views/routing_group_templates/show.haml     | 31 ------------------
 clients/cimi/views/routing_groups/index.haml    | 29 -----------------
 clients/cimi/views/routing_groups/show.haml     | 29 -----------------
 .../cimi/views/vsp_configurations/index.haml    | 25 ---------------
 clients/cimi/views/vsp_configurations/show.haml | 31 ------------------
 clients/cimi/views/vsp_templates/index.haml     | 30 ------------------
 clients/cimi/views/vsp_templates/show.haml      | 29 -----------------
 clients/cimi/views/vsps/index.haml              | 30 ------------------
 clients/cimi/views/vsps/show.haml               | 33 --------------------
 server/lib/deltacloud/core_ext/string.rb        |  1 -
 18 files changed, 458 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/app.rb
----------------------------------------------------------------------
diff --git a/clients/cimi/app.rb b/clients/cimi/app.rb
index 465ad90..67c3f8f 100644
--- a/clients/cimi/app.rb
+++ b/clients/cimi/app.rb
@@ -38,11 +38,6 @@ module CIMI::Frontend
     use CIMI::Frontend::NetworkPortTemplate
     use CIMI::Frontend::NetworkTemplate
     use CIMI::Frontend::NetworkPort
-    use CIMI::Frontend::RoutingGroup
-    use CIMI::Frontend::RoutingGroupTemplate
-    use CIMI::Frontend::VSP
-    use CIMI::Frontend::VSPConfiguration
-    use CIMI::Frontend::VSPTemplate
     use Rack::Session::Cookie
 
     helpers CIMI::Frontend::Helper

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/lib/entities.rb
----------------------------------------------------------------------
diff --git a/clients/cimi/lib/entities.rb b/clients/cimi/lib/entities.rb
index 49f74f5..522c10e 100644
--- a/clients/cimi/lib/entities.rb
+++ b/clients/cimi/lib/entities.rb
@@ -38,8 +38,3 @@ require 'entities/network_port'
 require 'entities/network_port_configuration'
 require 'entities/network_port_template'
 require 'entities/network_template'
-require 'entities/routing_group'
-require 'entities/routing_group_template'
-require 'entities/vsp'
-require 'entities/vsp_configuration'
-require 'entities/vsp_template'

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/lib/entities/routing_group.rb
----------------------------------------------------------------------
diff --git a/clients/cimi/lib/entities/routing_group.rb b/clients/cimi/lib/entities/routing_group.rb
deleted file mode 100644
index b39e831..0000000
--- a/clients/cimi/lib/entities/routing_group.rb
+++ /dev/null
@@ -1,30 +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::Frontend::RoutingGroup < CIMI::Frontend::Entity
-
-  get '/cimi/routing_groups/:id' do
-    routing_group_xml = get_entity('routing_groups', params[:id], credentials)
-    @routing_group = CIMI::Model::RoutingGroup.from_xml(routing_group_xml)
-    haml :'routing_groups/show'
-  end
-
-  get '/cimi/routing_groups' do
-    routing_groups_xml = get_entity_collection('routing_groups', credentials)
-    @routing_groups = collection_class_for(:routing_group).from_xml(routing_groups_xml)
-    haml :'routing_groups/index'
-  end
-
-end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/lib/entities/routing_group_template.rb
----------------------------------------------------------------------
diff --git a/clients/cimi/lib/entities/routing_group_template.rb b/clients/cimi/lib/entities/routing_group_template.rb
deleted file mode 100644
index 88e182f..0000000
--- a/clients/cimi/lib/entities/routing_group_template.rb
+++ /dev/null
@@ -1,30 +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::Frontend::RoutingGroupTemplate < CIMI::Frontend::Entity
-
-  get '/cimi/routing_group_templates/:id' do
-    rg_template_xml = get_entity('routing_group_templates', params[:id], credentials)
-    @rg_template = CIMI::Model::RoutingGroupTemplate.from_xml(rg_template_xml)
-    haml :'routing_group_templates/show'
-  end
-
-  get '/cimi/routing_group_templates' do
-    rg_templates_xml = get_entity_collection('routing_group_templates', credentials)
-    @rg_templates = collection_class_for(:routing_group_template).from_xml(rg_templates_xml)
-    haml :'routing_group_templates/index'
-  end
-
-end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/lib/entities/vsp.rb
----------------------------------------------------------------------
diff --git a/clients/cimi/lib/entities/vsp.rb b/clients/cimi/lib/entities/vsp.rb
deleted file mode 100644
index cd126bb..0000000
--- a/clients/cimi/lib/entities/vsp.rb
+++ /dev/null
@@ -1,30 +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::Frontend::VSP < CIMI::Frontend::Entity
-
-  get '/cimi/vsps/:id' do
-    vsp_xml = get_entity('vsps', params[:id], credentials)
-    @vsp = CIMI::Model::VSP.from_xml(vsp_xml)
-    haml :'vsps/show'
-  end
-
-  get '/cimi/vsps' do
-    vsps_xml = get_entity_collection('vsps', credentials)
-    @vsps = collection_class_for(:vsp).from_xml(vsps_xml)
-    haml :'vsps/index'
-  end
-
-end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/lib/entities/vsp_configuration.rb
----------------------------------------------------------------------
diff --git a/clients/cimi/lib/entities/vsp_configuration.rb b/clients/cimi/lib/entities/vsp_configuration.rb
deleted file mode 100644
index 0c29596..0000000
--- a/clients/cimi/lib/entities/vsp_configuration.rb
+++ /dev/null
@@ -1,30 +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::Frontend::VSPConfiguration < CIMI::Frontend::Entity
-
-  get '/cimi/vsp_configurations/:id' do
-    vsp_config_xml = get_entity('vsp_configurations', params[:id], credentials)
-    @vsp_config = CIMI::Model::VSPConfiguration.from_xml(vsp_config_xml)
-    haml :'vsp_configurations/show'
-  end
-
-  get '/cimi/vsp_configurations' do
-    vsp_configs_xml = get_entity_collection('vsp_configurations', credentials)
-    @vsp_configs = collection_class_for(:vsp_configuration).from_xml(vsp_configs_xml)
-    haml :'vsp_configurations/index'
-  end
-
-end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/lib/entities/vsp_template.rb
----------------------------------------------------------------------
diff --git a/clients/cimi/lib/entities/vsp_template.rb b/clients/cimi/lib/entities/vsp_template.rb
deleted file mode 100644
index 4845617..0000000
--- a/clients/cimi/lib/entities/vsp_template.rb
+++ /dev/null
@@ -1,30 +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::Frontend::VSPTemplate < CIMI::Frontend::Entity
-
-  get '/cimi/vsp_templates/:id' do
-    vsp_template_xml = get_entity('vsp_templates', params[:id], credentials)
-    @vsp_template = CIMI::Model::VSPTemplate.from_xml(vsp_template_xml)
-    haml :'vsp_templates/show'
-  end
-
-  get '/cimi/vsp_templates' do
-    vsp_templates_xml = get_entity_collection('vsp_templates', credentials)
-    @vsp_templates = collection_class_for(:vsp_template).from_xml(vsp_templates_xml)
-    haml :'vsp_templates/index'
-  end
-
-end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/routing_group_templates/index.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/routing_group_templates/index.haml b/clients/cimi/views/routing_group_templates/index.haml
deleted file mode 100644
index c601c33..0000000
--- a/clients/cimi/views/routing_group_templates/index.haml
+++ /dev/null
@@ -1,30 +0,0 @@
-- @title=@rg_templates.description
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li.active
-      RoutingGroupTemplateCollection
-- content_for :actions do
-  %p
-    %a{ :href => "#{@rg_templates.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@rg_templates.id}?format=json", :class => 'label warning' } JSON
-
-%blockquote
-  %p
-    A Routing Group Template Collection entity represents the collection of Routing
-    Group Template entities within a Provider. This entity can be used to locate and
-    create Routing Group Templates.
-
-%h3 RoutingGroupTemplateCollection
-%ul
-  - @rg_templates.routing_group_templates.each do |rg_template|
-    %li
-      %a{ :href => "/cimi/routing_group_templates/#{rg_template.href.split('/').last}"}=rg_template.href.split('/').last
-
--details 'RoutingGroupTemplateCollection details' do
-  -row 'ID', @rg_templates.id
-  -row 'Description', @rg_templates.description
-  -row 'Created', @rg_templates.created

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/routing_group_templates/show.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/routing_group_templates/show.haml b/clients/cimi/views/routing_group_templates/show.haml
deleted file mode 100644
index 89beb9f..0000000
--- a/clients/cimi/views/routing_group_templates/show.haml
+++ /dev/null
@@ -1,31 +0,0 @@
-- @title="#{@rg_template.name}"
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li
-      %a{ :href => "/cimi/routing_group_templates"} RoutingGroupTemplateCollection
-      %span.divider="/"
-    %li.active
-      =@rg_template.name
-
-- content_for :actions do
-  %p
-    %a{ :href => "#{@rg_template.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@rg_template.id}?format=json", :class => 'label warning' } JSON
-
-%blockquote
-  %p
-    A RoutingGroupTemplate entity captures the configuration values for realizing a RoutingGroup.
-    A Routing Group Template may be used to create multiple RoutingGroup
-
--details 'RoutingGroupTemplate details' do
-  -row 'ID', @rg_template.id
-  -row 'Description', @rg_template.description
-  -row 'Created', @rg_template.created
-
--details 'RoutingGroupTemplate networks' do
-  -@rg_template.networks.each do |net|
-    -row 'ID', net.href

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/routing_groups/index.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/routing_groups/index.haml b/clients/cimi/views/routing_groups/index.haml
deleted file mode 100644
index 0fde8b4..0000000
--- a/clients/cimi/views/routing_groups/index.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-- @title=@routing_groups.description
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li.active
-      RoutingGroupCollection
-- content_for :actions do
-  %p
-    %a{ :href => "#{@routing_groups.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@routing_groups.id}?format=json", :class => 'label warning' } JSON
-
-%blockquote
-  %p
-    A Routing Group Collection entity represents the collection of Routing Groups
-    within a Provider. This entity can be used to locate and create Routing Groups.
-
-%h3 RoutingGroupCollection
-%ul
-  - @routing_groups.routing_groups.each do |group|
-    %li
-      %a{ :href => "/cimi/routing_groups/#{group.href.split('/').last}"}=group.href.split('/').last
-
--details 'RoutingGroupCollection details' do
-  -row 'ID', @routing_groups.id
-  -row 'Description', @routing_groups.description
-  -row 'Created', @routing_groups.created

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/routing_groups/show.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/routing_groups/show.haml b/clients/cimi/views/routing_groups/show.haml
deleted file mode 100644
index 757de0b..0000000
--- a/clients/cimi/views/routing_groups/show.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-- @title="#{@routing_group.name}"
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li
-      %a{ :href => "/cimi/routing_groups"} RoutingGroupCollection
-      %span.divider="/"
-    %li.active
-      = @routing_group.name
-
-- content_for :actions do
-  %p
-    %a{ :href => "#{@routing_group.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@routing_group.id}?format=json", :class => 'label warning' } JSON
-%blockquote
-  %p
-    A Routing Group represents a collection of Networks that route to each other.
-
--details 'RoutingGroup details' do
-  -row 'ID', @routing_group.id
-  -row 'Description',@routing_group.description
-  -row 'Created',@routing_group.created
-
--details 'RoutingGroup Networks' do
-  -@routing_group.networks.each do |net|
-    -row 'ID', net.href

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/vsp_configurations/index.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/vsp_configurations/index.haml b/clients/cimi/views/vsp_configurations/index.haml
deleted file mode 100644
index 4b351a2..0000000
--- a/clients/cimi/views/vsp_configurations/index.haml
+++ /dev/null
@@ -1,25 +0,0 @@
-- @title=@vsp_configs.description
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li.active
-      VSPConfigurationCollection
-
-- content_for :actions do
-  %p
-    %a{ :href => "#{@vsp_configs.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@vsp_configs.id}?format=json", :class => 'label warning' } JSON
-
-%h3 VSPConfigurationCollection
-%ul
-  - @vsp_configs.vsp_configurations.each do |vsp_config|
-    %li
-      %a{ :href => "/cimi/vsp_configurations/#{href_to_id(vsp_config.id)}"}=href_to_id(vsp_config.id)
-
--details 'VSPConfigurationCollection details' do
-  -row 'ID', @vsp_configs.id
-  -row 'Description', @vsp_configs.description
-  -row 'Created', @vsp_configs.created

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/vsp_configurations/show.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/vsp_configurations/show.haml b/clients/cimi/views/vsp_configurations/show.haml
deleted file mode 100644
index 3ab2dfb..0000000
--- a/clients/cimi/views/vsp_configurations/show.haml
+++ /dev/null
@@ -1,31 +0,0 @@
-- @title="#{@vsp_config.name}"
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li
-      %a{ :href => "/cimi/vsp_configurations"} VSPConfigurationCollection
-      %span.divider="/"
-    %li.active
-      = @vsp_config.name
-
-- content_for :actions do
-  %p
-    %a{ :href => "#{@vsp_config.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@vsp_config.id}?format=json", :class => 'label warning' } JSON
-
-%blockquote
-  %p
-    The set of configuration values representing the information needed to create a VSP with
certain characteristics.
-
--details 'VSPConfiguration details' do
-  -row 'ID', @vsp_config.id
-  -row 'Description', @vsp_config.description
-  -row 'Created', @vsp_config.created
-  -row 'Bandwidth Reservation', @vsp_config.bandwidth_reservation
-  -row 'Traffic Priority', @vsp_config.traffic_priority
-  -row 'Maximum Traffic Delay', @vsp_config.max_traffic_delay
-  -row 'Maximum Traffic Loss', @vsp_config.max_traffic_loss
-  -row 'Maximum Traffic Jitter', @vsp_config.max_traffic_jitter

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/vsp_templates/index.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/vsp_templates/index.haml b/clients/cimi/views/vsp_templates/index.haml
deleted file mode 100644
index 025f438..0000000
--- a/clients/cimi/views/vsp_templates/index.haml
+++ /dev/null
@@ -1,30 +0,0 @@
-- @title=@vsp_templates.description
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li.active
-      VSPTemplateCollection
-
-- content_for :actions do
-  %p
-    %a{ :href => "#{@vsp_templates.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@vsp_templates.id}?format=json", :class => 'label warning' } JSON
-
-%blockquote
-  %p
-    A VSP Template Collection entity represents the collection of VSP Templates within a
Provider.
-    This entity can be used to locate and create VSP Templates.
-
-%h3 VSPTemplateCollection
-%ul
-  - @vsp_templates.vsp_templates.each do |vsp_templ|
-    %li
-      %a{ :href => "/cimi/vsp_templates/#{vsp_templ.href.split('/').last}"}=vsp_templ.href.split('/').last
-
--details 'VSPTemplateCollection details' do
-  -row 'ID', @vsp_templates.id
-  -row 'Description', @vsp_templates.description
-  -row 'Created', @vsp_templates.created

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/vsp_templates/show.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/vsp_templates/show.haml b/clients/cimi/views/vsp_templates/show.haml
deleted file mode 100644
index 157a8fd..0000000
--- a/clients/cimi/views/vsp_templates/show.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-- @title="#{@vsp_template.name}"
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li
-      %a{ :href => "/cimi/vsp_templates"} VSPTemplateCollection
-      %span.divider="/"
-    %li.active
-      = @vsp_template.name
-
-- content_for :actions do
-  %p
-    %a{ :href => "#{@vsp_template.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@vsp_template.id}?format=json", :class => 'label warning' } JSON
-
-%blockquote
-  %p
-    The VSP Template is a set of Configuration values for realizing a VSP.
-    A VSP Template may be used to create multiple VSPs
-
--details 'VSPTemplate details' do
-  -row 'ID', @vsp_template.id
-  -row 'Description', @vsp_template.description
-  -row 'Created', @vsp_template.created
-  -row 'Network', @vsp_template.network.href
-  -row 'VSP Config', @vsp_template.vsp_config.href

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/vsps/index.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/vsps/index.haml b/clients/cimi/views/vsps/index.haml
deleted file mode 100644
index 163f777..0000000
--- a/clients/cimi/views/vsps/index.haml
+++ /dev/null
@@ -1,30 +0,0 @@
-- @title=@vsps.description
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li.active
-      VSPCollection
-
-- content_for :actions do
-  %p
-    %a{ :href => "#{@vsps.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@vsps.id}?format=json", :class => 'label warning' } JSON
-
-%blockquote
-  %p
-    A VSP Collection entity represents the collection of VSPs within a Provider.
-    This entity can be used to locate and create VSPs.
-
-%h3 VSPCollection
-%ul
-  - @vsps.vsps.each do |vsp|
-    %li
-      %a{ :href => "/cimi/vsps/#{vsp.href.split('/').last}"}=vsp.href.split('/').last
-
--details 'VSPCollection details' do
-  -row 'ID', @vsps.id
-  -row 'Description', @vsps.description
-  -row 'Created', @vsps.created

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/clients/cimi/views/vsps/show.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/vsps/show.haml b/clients/cimi/views/vsps/show.haml
deleted file mode 100644
index 432b45e..0000000
--- a/clients/cimi/views/vsps/show.haml
+++ /dev/null
@@ -1,33 +0,0 @@
-- @title="#{@vsp.name}"
-
-- content_for :breadcrumb do
-  %ul.breadcrumb
-    %li
-      %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
-      %span.divider="/"
-    %li
-      %a{ :href => "/cimi/vsps"} VSPCollection
-      %span.divider="/"
-    %li.active
-      = @vsp.name
-
-- content_for :actions do
-  %p
-    %a{ :href => "#{@vsp.id}?format=xml", :class => 'label warning' } XML
-    %a{ :href => "#{@vsp.id}?format=json", :class => 'label warning' } JSON
-
-%blockquote
-  %p
-    A VSP represents the connection parameters of a network port.
-
--details 'VSP details' do
-  -row 'ID', @vsp.id
-  -row 'Description', @vsp.description
-  -row 'Created', @vsp.created
-  -row 'State', @vsp.state
-  -row 'Network', @vsp.network.href
-  -row 'Bandwidth Reservation', @vsp.bandwidth_reservation
-  -row 'Traffic Priority', @vsp.traffic_priority
-  -row 'Maximum Traffic Delay', @vsp.max_traffic_delay
-  -row 'Maximum Traffic Loss', @vsp.max_traffic_loss
-  -row 'Maximum Traffic Jitter', @vsp.max_traffic_jitter

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b2ad2ee8/server/lib/deltacloud/core_ext/string.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/core_ext/string.rb b/server/lib/deltacloud/core_ext/string.rb
index f4c45e5..ca1663a 100644
--- a/server/lib/deltacloud/core_ext/string.rb
+++ b/server/lib/deltacloud/core_ext/string.rb
@@ -56,7 +56,6 @@ class String
 
   unless method_defined? 'underscore'
     def underscore
-      return self.downcase if self =~ /VSPs$/i
       gsub(/::/, '/').
         gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
         gsub(/([a-z\d])([A-Z])/,'\1_\2').


Mime
View raw message