mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
8b4c36ef50
As part of the bug 'CLOUDSTACK-9339 Virtual Routers don't handle Multiple Public Interfaces correctly' issue of mismatch of traffic type represented by 'nw_type' in config sent by management server in ip_associations.json and how it is persisted in the ips.json data bag are differnet, is addressed, however missed the change in final merge. this bug is to add the functionality in cs_ip.py, to lower the traffic type sent by management server before persisting in the ips.json databag
52 lines
1.8 KiB
Python
Executable File
52 lines
1.8 KiB
Python
Executable File
# -- coding: utf-8 --
|
|
# 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.
|
|
from pprint import pprint
|
|
from netaddr import *
|
|
|
|
|
|
def merge(dbag, ip):
|
|
added = False
|
|
nic_dev_id = None
|
|
for dev in dbag:
|
|
if dev == "id":
|
|
continue
|
|
for address in dbag[dev]:
|
|
if address['public_ip'] == ip['public_ip']:
|
|
if 'nic_dev_id' in address:
|
|
nic_dev_id = address['nic_dev_id']
|
|
dbag[dev].remove(address)
|
|
|
|
ipo = IPNetwork(ip['public_ip'] + '/' + ip['netmask'])
|
|
if 'nic_dev_id' in ip:
|
|
nic_dev_id = ip['nic_dev_id']
|
|
ip['device'] = 'eth' + str(nic_dev_id)
|
|
ip['broadcast'] = str(ipo.broadcast)
|
|
ip['cidr'] = str(ipo.ip) + '/' + str(ipo.prefixlen)
|
|
ip['size'] = str(ipo.prefixlen)
|
|
ip['network'] = str(ipo.network) + '/' + str(ipo.prefixlen)
|
|
if 'nw_type' not in ip.keys():
|
|
ip['nw_type'] = 'public'
|
|
else:
|
|
ip['nw_type'] = ip['nw_type'].lower()
|
|
if ip['nw_type'] == 'control':
|
|
dbag['eth' + str(nic_dev_id)] = [ip]
|
|
else:
|
|
dbag.setdefault('eth' + str(nic_dev_id), []).append(ip)
|
|
|
|
return dbag
|