Hi Martha: still have the same issue - this patch won't apply (error below). I tried saving patch as both .eml (git am) as well as .txt.
It might be an issue with my setup... are you (anyone else?) able to apply this patch onto current git master? marios ===> with git am: [marios@name deltacloud]$ git am /home/marios/Documents/WORK/Patches/Martha/\[PATCH\ 1_5\]\ added\ network\ port\ configs\ view\ files\ and\ network_port_config\ to\ entities\ -\ martha.c.ch...@gmail.com\ -\ 2013-01-16\ 1905.eml Applying: added network port configs view files and network_port_config to entities error: patch failed: clients/cimi/app.rb:30 error: clients/cimi/app.rb: patch does not apply error: patch failed: clients/cimi/lib/entities.rb:30 error: clients/cimi/lib/entities.rb: patch does not apply Patch failed at 0001 added network port configs view files and network_port_config to entities The copy of the patch that failed is found in: /home/marios/Documents/WORK/NewEclipsey/DCore/deltacloud_git_repo/deltacloud/.git/rebase-apply/patch When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". [marios@name deltacloud]$ git am --abort ==> with git apply: [marios@name deltacloud]$ cat | git apply /home/marios/Documents/WORK/Patches/Martha/\[PATCH\ 1_5\]\ added\ network\ port\ configs\ view\ files\ and\ network_port_config\ to\ entities.txt error: patch failed: clients/cimi/app.rb:30 error: clients/cimi/app.rb: patch does not apply error: patch failed: clients/cimi/lib/entities.rb:30 error: clients/cimi/lib/entities.rb: patch does not apply On 16/01/13 19:05, martha.c.ch...@gmail.com wrote: > From: NjeriChelimo <martha.c.ch...@gmail.com> > > --- > clients/cimi/app.rb | 1 + > clients/cimi/lib/entities.rb | 1 + > .../lib/entities/network_port_configuration.rb | 30 > ++++++++++++++++++++ > .../views/network_port_configurations/index.haml | 23 +++++++++++++++ > .../views/network_port_configurations/show.haml | 24 ++++++++++++++++ > 5 files changed, 79 insertions(+) > create mode 100644 clients/cimi/lib/entities/network_port_configuration.rb > create mode 100644 clients/cimi/views/network_port_configurations/index.haml > create mode 100644 clients/cimi/views/network_port_configurations/show.haml > > diff --git a/clients/cimi/app.rb b/clients/cimi/app.rb > index e26f2b9..54f0691 100644 > --- a/clients/cimi/app.rb > +++ b/clients/cimi/app.rb > @@ -30,6 +30,7 @@ module CIMI::Frontend > use CIMI::Frontend::Volume > use CIMI::Frontend::Network > use CIMI::Frontend::NetworkConfiguration > + use CIMI::Frontend::NetworkPortConfiguration > use CIMI::Frontend::NetworkTemplate > use CIMI::Frontend::RoutingGroup > use CIMI::Frontend::RoutingGroupTemplate > diff --git a/clients/cimi/lib/entities.rb b/clients/cimi/lib/entities.rb > index 3442360..86cae29 100644 > --- a/clients/cimi/lib/entities.rb > +++ b/clients/cimi/lib/entities.rb > @@ -30,6 +30,7 @@ require 'entities/volume_image' > require 'entities/volume' > require 'entities/network' > require 'entities/network_configuration' > +require 'entities/network_port_configuration' > require 'entities/network_template' > require 'entities/routing_group' > require 'entities/routing_group_template' > diff --git a/clients/cimi/lib/entities/network_port_configuration.rb > b/clients/cimi/lib/entities/network_port_configuration.rb > new file mode 100644 > index 0000000..84d5669 > --- /dev/null > +++ b/clients/cimi/lib/entities/network_port_configuration.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::NetworkPortConfiguration < CIMI::Frontend::Entity > + > + get '/cimi/network_port_configurations/:id' do > + network_port_config_xml = get_entity('network_port_configurations', > params[:id], credentials) > + @network_port_config = > CIMI::Model::NetworkPortConfiguration.from_xml(network_port_config_xml) > + haml :'network_port_configurations/show' > + end > + > + get '/cimi/network_port_configurations' do > + network_port_configs_xml = > get_entity_collection('network_port_configurations', credentials) > + @network_port_configs = > CIMI::Model::NetworkPortConfigurationCollection.from_xml(network_port_configs_xml) > + haml :'network_port_configurations/index' > + end > + > +end > diff --git a/clients/cimi/views/network_port_configurations/index.haml > b/clients/cimi/views/network_port_configurations/index.haml > new file mode 100644 > index 0000000..30bc721 > --- /dev/null > +++ b/clients/cimi/views/network_port_configurations/index.haml > @@ -0,0 +1,23 @@ > +- @title=collection_name @network_port_configs > + > +- content_for :breadcrumb do > + %ul.breadcrumb > + %li > + %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint > + %span.divider="/" > + %li.active > + NetworkPortConfigurationCollection > + > +- content_for :actions do > + %p > + %a{ :href => "#{@network_port_configs.id}?format=xml", :class => 'label > warning' } XML > + %a{ :href => "#{@network_port_configs.id}?format=json", :class => 'label > warning' } JSON > + > +%ul > + - @network_port_configs.network_port_configurations.each do |conf| > + %li > + %a{ :href => > "/cimi/network_port_configurations/#{href_to_id(conf.id)}"}=href_to_id(conf.id) > + > +-details 'NetworkPortConfigurationCollection details' do > + -row 'ID', @network_port_configs.id > + -row 'Count', @network_port_configs.count > diff --git a/clients/cimi/views/network_port_configurations/show.haml > b/clients/cimi/views/network_port_configurations/show.haml > new file mode 100644 > index 0000000..79b2be0 > --- /dev/null > +++ b/clients/cimi/views/network_port_configurations/show.haml > @@ -0,0 +1,24 @@ > +- @title="#{@network_port_config.name}" > + > +- content_for :breadcrumb do > + %ul.breadcrumb > + %li > + %a{ :href => "/cimi/cloudEntryPoint"} CloudEntryPoint > + %span.divider="/" > + %li > + %a{ :href => "/cimi/network_port_configurations"} > NetworkPortConfigurationCollection > + %span.divider="/" > + %li.active > + = @network_port_config.name > + > +- content_for :actions do > + %p > + %a{ :href => "#{@network_port_config.id}?format=xml", :class => 'label > warning' } XML > + %a{ :href => "#{@network_port_config.id}?format=json", :class => 'label > warning' } JSON > + > +-details do > + -row 'ID', @network_port_config.id > + -row 'Description',@network_port_config.description > + -row 'Created',@network_port_config.created > + -row 'Class of Service',@network_port_config.class_of_service > + -row 'Port Type',@network_port_config.port_type >
