From: NjeriChelimo <[email protected]>
---
clients/cimi/app.rb | 4 +--
clients/cimi/lib/entities.rb | 4 +--
clients/cimi/lib/entities/forwarding_group.rb | 30 +++++++++++++++++++
.../cimi/lib/entities/forwarding_group_template.rb | 30 +++++++++++++++++++
.../views/forwarding_group_templates/index.haml | 29 ++++++++++++++++++
.../views/forwarding_group_templates/show.haml | 31 ++++++++++++++++++++
clients/cimi/views/forwarding_groups/index.haml | 28 ++++++++++++++++++
clients/cimi/views/forwarding_groups/show.haml | 29 ++++++++++++++++++
8 files changed, 181 insertions(+), 4 deletions(-)
create mode 100644 clients/cimi/lib/entities/forwarding_group.rb
create mode 100644 clients/cimi/lib/entities/forwarding_group_template.rb
create mode 100644 clients/cimi/views/forwarding_group_templates/index.haml
create mode 100644 clients/cimi/views/forwarding_group_templates/show.haml
create mode 100644 clients/cimi/views/forwarding_groups/index.haml
create mode 100644 clients/cimi/views/forwarding_groups/show.haml
diff --git a/clients/cimi/app.rb b/clients/cimi/app.rb
index 3809425..bf763d7 100644
--- a/clients/cimi/app.rb
+++ b/clients/cimi/app.rb
@@ -36,11 +36,11 @@ 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 CIMI::Frontend::ForwardingGroup
+ use CIMI::Frontend::ForwardingGroupTemplate
use Rack::Session::Cookie
helpers CIMI::Frontend::Helper
diff --git a/clients/cimi/lib/entities.rb b/clients/cimi/lib/entities.rb
index c5c40df..0f54ca6 100644
--- a/clients/cimi/lib/entities.rb
+++ b/clients/cimi/lib/entities.rb
@@ -22,6 +22,8 @@ require 'entities/base_entity'
require 'entities/cloud_entry_point'
require 'entities/address'
require 'entities/address_template'
+require 'entities/forwarding_group'
+require 'entities/forwarding_group_template'
require 'entities/machine_configuration'
require 'entities/machine_admin'
require 'entities/machine_image'
@@ -36,8 +38,6 @@ 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'
diff --git a/clients/cimi/lib/entities/forwarding_group.rb
b/clients/cimi/lib/entities/forwarding_group.rb
new file mode 100644
index 0000000..6ba5d60
--- /dev/null
+++ b/clients/cimi/lib/entities/forwarding_group.rb
@@ -0,0 +1,30 @@
+# 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::ForwardingGroup < CIMI::Frontend::Entity
+
+ get '/cimi/forwarding_groups/:id' do
+ forwarding_group_xml = get_entity('forwarding_groups', params[:id],
credentials)
+ @forwarding_group =
CIMI::Model::ForwardingGroup.from_xml(forwarding_group_xml)
+ haml :'forwarding_groups/show'
+ end
+
+ get '/cimi/forwarding_groups' do
+ forwarding_groups_xml = get_entity_collection('forwarding_groups',
credentials)
+ @forwarding_groups =
CIMI::Model::ForwardingGroupCollection.from_xml(forwarding_groups_xml)
+ haml :'forwarding_groups/index'
+ end
+
+end
diff --git a/clients/cimi/lib/entities/forwarding_group_template.rb
b/clients/cimi/lib/entities/forwarding_group_template.rb
new file mode 100644
index 0000000..1636ad8
--- /dev/null
+++ b/clients/cimi/lib/entities/forwarding_group_template.rb
@@ -0,0 +1,30 @@
+# 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::ForwardingGroupTemplate < CIMI::Frontend::Entity
+
+ get '/cimi/forwarding_group_templates/:id' do
+ fg_template_xml = get_entity('forwarding_group_templates', params[:id],
credentials)
+ @fg_template =
CIMI::Model::ForwardingGroupTemplate.from_xml(fg_template_xml)
+ haml :'forwarding_group_templates/show'
+ end
+
+ get '/cimi/forwarding_group_templates' do
+ fg_templates_xml = get_entity_collection('forwarding_group_templates',
credentials)
+ @fg_templates =
CIMI::Model::ForwardingGroupTemplateCollection.from_xml(fg_templates_xml)
+ haml :'forwarding_group_templates/index'
+ end
+
+end
diff --git a/clients/cimi/views/forwarding_group_templates/index.haml
b/clients/cimi/views/forwarding_group_templates/index.haml
new file mode 100644
index 0000000..2c86e5c
--- /dev/null
+++ b/clients/cimi/views/forwarding_group_templates/index.haml
@@ -0,0 +1,29 @@
+- @title=collection_name @fg_templates
+
+- content_for :breadcrumb do
+ %ul.breadcrumb
+ %li
+ %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
+ %span.divider="/"
+ %li.active
+ ForwardingGroupTemplateCollection
+- content_for :actions do
+ %p
+ %a{ :href => "#{@fg_templates.id}?format=xml", :class => 'label warning' }
XML
+ %a{ :href => "#{@fg_templates.id}?format=json", :class => 'label warning'
} JSON
+
+%blockquote
+ %p
+ A Forwarding Group Template Collection entity represents the collection of
Forwarding
+ Group Template entities within a Provider. This entity can be used to
locate and
+ create Forwarding Group Templates.
+
+%h3 ForwardingGroupTemplateCollection
+%ul
+ - @fg_templates.forwarding_group_templates.each do |fg_template|
+ %li
+ %a{ :href => "/cimi/forwarding_group_templates/#{href_to_id
fg_template.id}"}=href_to_id(fg_template.id)
+
+-details 'ForwardingGroupTemplateCollection details' do
+ -row 'ID', @fg_templates.id
+ -row 'Count', @fg_templates.count
diff --git a/clients/cimi/views/forwarding_group_templates/show.haml
b/clients/cimi/views/forwarding_group_templates/show.haml
new file mode 100644
index 0000000..d5b78a0
--- /dev/null
+++ b/clients/cimi/views/forwarding_group_templates/show.haml
@@ -0,0 +1,31 @@
+- @title="#{@fg_template.name}"
+
+- content_for :breadcrumb do
+ %ul.breadcrumb
+ %li
+ %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
+ %span.divider="/"
+ %li
+ %a{ :href => "/cimi/forwarding_group_templates"}
ForwardingGroupTemplateCollection
+ %span.divider="/"
+ %li.active
+ =@fg_template.name
+
+- content_for :actions do
+ %p
+ %a{ :href => "#{@fg_template.id}?format=xml", :class => 'label warning' }
XML
+ %a{ :href => "#{@fg_template.id}?format=json", :class => 'label warning' }
JSON
+
+%blockquote
+ %p
+ A ForwardingGroupTemplate entity captures the configuration values for
realizing a ForwardingGroup.
+ A Forwarding Group Template may be used to create multiple ForwardingGroup
+
+-details 'ForwardingGroupTemplate details' do
+ -row 'ID', @fg_template.id
+ -row 'Description', @fg_template.description
+ -row 'Created', @fg_template.created
+
+-details 'ForwardingGroupTemplate networks' do
+ -@fg_template.networks.each do |net|
+ -row 'ID', net.href
diff --git a/clients/cimi/views/forwarding_groups/index.haml
b/clients/cimi/views/forwarding_groups/index.haml
new file mode 100644
index 0000000..cb5a737
--- /dev/null
+++ b/clients/cimi/views/forwarding_groups/index.haml
@@ -0,0 +1,28 @@
+- @title=collection_name @forwarding_groups
+
+- content_for :breadcrumb do
+ %ul.breadcrumb
+ %li
+ %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
+ %span.divider="/"
+ %li.active
+ ForwardingGroupCollection
+- content_for :actions do
+ %p
+ %a{ :href => "#{@forwarding_groups.id}?format=xml", :class => 'label
warning' } XML
+ %a{ :href => "#{@forwarding_groups.id}?format=json", :class => 'label
warning' } JSON
+
+%blockquote
+ %p
+ A Forwarding Group Collection entity represents the collection of
Forwarding Groups
+ within a Provider. This entity can be used to locate and create Forwarding
Groups.
+
+%h3 ForwardingGroupCollection
+%ul
+ - @forwarding_groups.forwarding_groups.each do |group|
+ %li
+ %a{ :href => "/cimi/forwarding_groups/#{href_to_id
group.id}"}=href_to_id(group.id)
+
+-details 'ForwardingGroupCollection details' do
+ -row 'ID', @forwarding_groups.id
+ -row 'Count', @forwarding_groups.count
diff --git a/clients/cimi/views/forwarding_groups/show.haml
b/clients/cimi/views/forwarding_groups/show.haml
new file mode 100644
index 0000000..4ff032c
--- /dev/null
+++ b/clients/cimi/views/forwarding_groups/show.haml
@@ -0,0 +1,29 @@
+- @title="#{@forwarding_group.name}"
+
+- content_for :breadcrumb do
+ %ul.breadcrumb
+ %li
+ %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint
+ %span.divider="/"
+ %li
+ %a{ :href => "/cimi/forwarding_groups"} ForwardingGroupCollection
+ %span.divider="/"
+ %li.active
+ = @forwarding_group.name
+
+- content_for :actions do
+ %p
+ %a{ :href => "#{@forwarding_group.id}?format=xml", :class => 'label
warning' } XML
+ %a{ :href => "#{@forwarding_group.id}?format=json", :class => 'label
warning' } JSON
+%blockquote
+ %p
+ A Forwarding Group represents a collection of Networks that route to each
other.
+
+-details 'ForwardingGroup details' do
+ -row 'ID', @forwarding_group.id
+ -row 'Description',@forwarding_group.description
+ -row 'Created',@forwarding_group.created
+
+-details 'ForwardingGroup Networks' do
+ -@forwarding_group.networks.each do |net|
+ -row 'ID', net.href
--
1.7.9.5
