summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
543430b)
and network not found error. This fix ensures that
some default networks are always available for OSM.
Change-Id: I0ae791d64c527ea451b406452619d04e6f3b98af
Signed-off-by: peusterm <manuel.peuster@uni-paderborn.de>
for net in self.nets.values():
if net.name == name_or_id:
return net
for net in self.nets.values():
if net.name == name_or_id:
return net
+ LOG.warning("Could not find net '{}' in {} or {}"
+ .format(name_or_id,
+ self.nets.keys(),
+ [n.name for n in self.nets.values()]))
return None
def create_network(self, name, stack_operation=False):
return None
def create_network(self, name, stack_operation=False):
def net(self, value):
if self._net is None:
self._net = value
def net(self, value):
if self._net is None:
self._net = value
+ # create default networks
self.init_floating_network()
self._net = value
self.init_floating_network()
self._net = value
- def init_floating_network(self):
+ def init_floating_network(self, name="default"):
"""
Initialize the floating network component for the emulator.
Will not do anything if already initialized.
"""
if self.net is not None and self.floating_switch is None:
# create a floating network
"""
Initialize the floating network component for the emulator.
Will not do anything if already initialized.
"""
if self.net is not None and self.floating_switch is None:
# create a floating network
- fn = self.floating_network = Net("default")
+ fn = self.floating_network = Net(name)
fn.id = str(uuid.uuid4())
fn.set_cidr(self.floating_netmask)
fn.id = str(uuid.uuid4())
fn.set_cidr(self.floating_netmask)
super(NeutronDummyApi, self).__init__(ip, port)
self.compute = compute
super(NeutronDummyApi, self).__init__(ip, port)
self.compute = compute
+ # create default networks (OSM usually assumes to have these pre-configured)
+ self.compute.create_network("mgmt")
+ self.compute.create_network("mgmtnet")
+
self.api.add_resource(NeutronListAPIVersions, "/")
self.api.add_resource(NeutronShowAPIv2Details, "/v2.0")
self.api.add_resource(NeutronListNetworks, "/v2.0/networks.json", "/v2.0/networks",
self.api.add_resource(NeutronListAPIVersions, "/")
self.api.add_resource(NeutronShowAPIv2Details, "/v2.0")
self.api.add_resource(NeutronListNetworks, "/v2.0/networks.json", "/v2.0/networks",
:rtype: :class:`flask.response`
"""
LOG.debug("API CALL: %s GET" % str(self.__class__.__name__))
:rtype: :class:`flask.response`
"""
LOG.debug("API CALL: %s GET" % str(self.__class__.__name__))
+ # LOG.debug("ARGS: {}".format(request.args))
try:
if request.args.get('name'):
tmp_network = NeutronShowNetwork(self.api)
try:
if request.args.get('name'):
tmp_network = NeutronShowNetwork(self.api)
- return tmp_network.get_network(request.args.get('name'), True)
+ response = tmp_network.get_network(request.args.get('name'), True)
+ LOG.debug("{} RESPONSE (1): {}".format(self.__class__.__name__, response))
+ return response
id_list = request.args.getlist('id')
if len(id_list) == 1:
tmp_network = NeutronShowNetwork(self.api)
id_list = request.args.getlist('id')
if len(id_list) == 1:
tmp_network = NeutronShowNetwork(self.api)
- return tmp_network.get_network(request.args.get('id'), True)
+ response = tmp_network.get_network(request.args.get('id'), True)
+ LOG.debug("{} RESPONSE (2): {}".format(self.__class__.__name__, response))
+ return response
network_list = list()
network_dict = dict()
network_list = list()
network_dict = dict()
network_list.append(tmp_network_dict)
network_dict["networks"] = network_list
network_list.append(tmp_network_dict)
network_dict["networks"] = network_list
+ LOG.debug("{} RESPONSE (3): {}".format(self.__class__.__name__, network_dict))
return Response(json.dumps(network_dict), status=200, mimetype='application/json')
except Exception as ex:
return Response(json.dumps(network_dict), status=200, mimetype='application/json')
except Exception as ex: