ACK.

On Tue, Mar 5, 2013 at 12:36 PM, <mar...@redhat.com> wrote:

> From: marios <mar...@redhat.com>
>
>
> Signed-off-by: marios <mar...@redhat.com>
> ---
>  server/lib/cimi/models/network_create.rb | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/server/lib/cimi/models/network_create.rb
> b/server/lib/cimi/models/network_create.rb
> index 006a064..2496269 100644
> --- a/server/lib/cimi/models/network_create.rb
> +++ b/server/lib/cimi/models/network_create.rb
> @@ -13,25 +13,27 @@
>  # License for the specific language governing permissions and limitations
>  # under the License.
>
> -class CIMI::Model::Network < CIMI::Model::Base
> +class CIMI::Model::NetworkCreate < CIMI::Model::Base
>
>    ref :network_template, :required => true
>
>    def create(context)
>      validate!
> -
>      if network_template.href?
>        template = network_template.find(context)
> +      network_config = template.network_config.find(context)
> +      forwarding_group = template.forwarding_group.find(context)
> +    else
> +      network_config =
> CIMI::Model::NetworkConfiguration.find(context.href_id(network_template.network_config.href,
> :network_configurations), context)
> +      forwarding_group =
> CIMI::Model::ForwardingGroup.find(context.href_id(network_template.forwarding_group.href,
> :forwarding_groups), context)
>      end
> -
>      params = {
> -      :network_config => template.network_config.find(context),
> -      :forwarding_group => template.forwarding_group.find(context),
> +      :network_config => network_config,
> +      :forwarding_group => forwarding_group,
>        :name => name,
>        :description => description,
>        :env => context # FIXME: We should not pass the context to the
> driver (!)
>      }
> -
>      network = context.driver.create_network(context.credentials, params)
>      network.property = property if property
>      network.save
> --
> 1.8.1.4
>
>


-- 
{ email : "martha.c.ch...@gmail.com" ,
  social : [ { twitter : "@NjeriChelimo" } , {facebook : "Njeri Chelimo" }
],
  code : [ { github : "Njeri Chelimo"}, { bitbucket : "nchelimo" } ],
  skype : "martha.chumo"
}

Reply via email to