mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
85aee8d18d
- Refactors and simplifies systemvm codebase file structures keeping the same resultant systemvm.iso packaging - Password server systemd script and new postinit script that runs before sshd starts - Fixes to keepalived and conntrackd config to make rVRs work again - New /etc/issue featuring ascii based cloudmonkey logo/message and systemvmtemplate version - SystemVM python codebase linted and tested. Added pylint/pep to Travis. - iptables re-application fixes for non-VR systemvms. - SystemVM template build fixes. - Default secondary storage vm service offering boosted to have 2vCPUs and RAM equal to console proxy. - Fixes to several marvin based smoke tests, especially rVR related tests. rVR tests to consider 3*advert_int+skew timeout before status is checked. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
54 lines
2.0 KiB
Python
Executable File
54 lines
2.0 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 netaddr import *
|
|
|
|
|
|
def merge(dbag, ip):
|
|
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[ip['device']] = [ip]
|
|
else:
|
|
if 'source_nat' in ip and ip['source_nat'] and ip['device'] in dbag and len(dbag[ip['device']]) > 0:
|
|
dbag[ip['device']].insert(0, ip) # Make sure the source_nat ip is first (primary) on the device
|
|
else:
|
|
dbag.setdefault(ip['device'], []).append(ip)
|
|
|
|
return dbag
|