Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A1DE09901 for ; Fri, 16 Mar 2012 17:38:58 +0000 (UTC) Received: (qmail 14467 invoked by uid 500); 16 Mar 2012 17:38:58 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 14448 invoked by uid 500); 16 Mar 2012 17:38:58 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 14440 invoked by uid 99); 16 Mar 2012 17:38:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 17:38:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 31C38764C; Fri, 16 Mar 2012 17:38:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marios@apache.org To: commits@deltacloud.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: CIMI: adds views for network_templates and routing_groups entities to CIMI client app Message-Id: <20120316173858.31C38764C@tyr.zones.apache.org> Date: Fri, 16 Mar 2012 17:38:58 +0000 (UTC) CIMI: adds views for network_templates and routing_groups entities to CIMI client app Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/3e938d2a Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/3e938d2a Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/3e938d2a Branch: refs/heads/master Commit: 3e938d2a386f053628d0ccce27e672cb368c0eb4 Parents: de70805 Author: marios Authored: Fri Mar 16 15:53:14 2012 +0200 Committer: marios Committed: Fri Mar 16 15:53:14 2012 +0200 ---------------------------------------------------------------------- clients/cimi/views/network_templates/index.haml | 29 ++++++++++++++++++ clients/cimi/views/network_templates/show.haml | 28 +++++++++++++++++ clients/cimi/views/networks/show.haml | 1 + clients/cimi/views/routing_groups/index.haml | 29 ++++++++++++++++++ clients/cimi/views/routing_groups/show.haml | 29 ++++++++++++++++++ 5 files changed, 116 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/3e938d2a/clients/cimi/views/network_templates/index.haml ---------------------------------------------------------------------- diff --git a/clients/cimi/views/network_templates/index.haml b/clients/cimi/views/network_templates/index.haml new file mode 100644 index 0000000..09eed69 --- /dev/null +++ b/clients/cimi/views/network_templates/index.haml @@ -0,0 +1,29 @@ +- @title=@network_templates.description + +- content_for :breadcrumb do + %ul.breadcrumb + %li + %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint + %span.divider="/" + %li.active + NetworkTemplateCollection +- content_for :actions do + %p + %a{ :href => "#{@network_templates.id}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@network_templates.id}?format=json", :class => 'label warning' } JSON + +%blockquote + %p + A Network Template Collection entity represents the collection of NetworkTemplates within a Provider. + This resource can be used to locate and create NetworkTemplates + +%h3 NetworkTemplateCollection +%ul + - @network_templates.network_templates.each do |template| + %li + %a{ :href => "/cimi/network_templates/#{template.href.split('/').last}"}=template.href.split('/').last + +-details 'NetworkTemplateCollection details' do + -row 'ID', @network_templates.id + -row 'Description', @network_templates.description + -row 'Created', @network_templates.created http://git-wip-us.apache.org/repos/asf/deltacloud/blob/3e938d2a/clients/cimi/views/network_templates/show.haml ---------------------------------------------------------------------- diff --git a/clients/cimi/views/network_templates/show.haml b/clients/cimi/views/network_templates/show.haml new file mode 100644 index 0000000..7977b74 --- /dev/null +++ b/clients/cimi/views/network_templates/show.haml @@ -0,0 +1,28 @@ +- @title="#{@network_template.name}" + +- content_for :breadcrumb do + %ul.breadcrumb + %li + %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint + %span.divider="/" + %li + %a{ :href => "/cimi/network_templates"} NetworkTemplateCollection + %span.divider="/" + %li.active + = @network_template.name + +- content_for :actions do + %p + %a{ :href => "#{@network_template.id}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@network_template.id}?format=json", :class => 'label warning' } JSON +%blockquote + %p + The Network Template is a set of configuration values for realizing a Network. + An instance of Network Template may be used to create multiple Networks + +-details 'NetworkConfiguration details' do + -row 'ID', @network_template.id + -row 'Description',@network_template.description + -row 'Created',@network_template.created + -row 'NetworkConfiguration', @network_template.network_config.href + -row 'RoutingGroup', @network_template.routing_group.href http://git-wip-us.apache.org/repos/asf/deltacloud/blob/3e938d2a/clients/cimi/views/networks/show.haml ---------------------------------------------------------------------- diff --git a/clients/cimi/views/networks/show.haml b/clients/cimi/views/networks/show.haml index 7aaf37e..8ec560a 100644 --- a/clients/cimi/views/networks/show.haml +++ b/clients/cimi/views/networks/show.haml @@ -27,6 +27,7 @@ -row 'Created', @network.created -row 'State', @network.state -row 'Access', @network.access + -row 'RoutingGroup', @network.routing_group.href -row 'Bandwidth Limit', @network.bandwidth_limit -row 'Traffic Priority', @network.traffic_priority -row 'Maximum Traffic Delay', @network.max_traffic_delay http://git-wip-us.apache.org/repos/asf/deltacloud/blob/3e938d2a/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 new file mode 100644 index 0000000..0fde8b4 --- /dev/null +++ b/clients/cimi/views/routing_groups/index.haml @@ -0,0 +1,29 @@ +- @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/3e938d2a/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 new file mode 100644 index 0000000..757de0b --- /dev/null +++ b/clients/cimi/views/routing_groups/show.haml @@ -0,0 +1,29 @@ +- @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