fixed_network template parameter should be fixed_network_cidr

[Tom Cammann]

An error is thrown when creating a bay model with a fixed network cidr.

e.g.

baymodel-create --name testbaymodel --image-id 72a8a226-d2d9-43a6-a799-ac190c4ea4ae --keypair-id testkey --external-network-id $NIC_ID --dns-nameserver 8.8.8.8 --flavor-id m1.small --docker-volume-size 5 --coe kubernetes --fixed-network "10.20.10.0/24"

magnum bay-create --name testbay --baymodel testbaymodel --node-count 2

ERROR: ERROR: The Parameter (fixed_network) was not defined in template.
Traceback (most recent call last):

  File "/usr/local/lib/python2.7/dist-packages/oslo_messaging/rpc/dispatcher.py", line 142, in _dispatch_and_reply
    executor_callback))

  File "/usr/local/lib/python2.7/dist-packages/oslo_messaging/rpc/dispatcher.py", line 186, in _dispatch
    executor_callback)

  File "/usr/local/lib/python2.7/dist-packages/oslo_messaging/rpc/dispatcher.py", line 130, in _do_dispatch
    result = func(ctxt, **new_args)

  File "/opt/stack/magnum/magnum/conductor/handlers/bay_k8s_heat.py", line 134, in bay_create
    raise exception.InvalidParameterValue(message=str(e))

InvalidParameterValue: ERROR: The Parameter (fixed_network) was not defined in template.
 (HTTP 400)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/178776
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=29dbc62504eb5cca86867f39120a39735dc5de3d
Submitter: Jenkins
Branch: master

commit 29dbc62504eb5cca86867f39120a39735dc5de3d
Author: Tom Cammann <email address hidden>
Date: Wed Apr 29 18:31:00 2015 +0100

    fixed_network should be fixed_network_cidr

    fixed_network should be fixed_network_cidr as this is the value that
    exists in the heat template.

    Update tests to use a cidr address string rather than a text string to
    match the parameters expected contents.

    Change-Id: I624b95930f9eb506abfb2e29beea8d83878ea142
    Closes-Bug: 1450140