Skip to content

R2.20 #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aswanikumar90 wants to merge 5 commits into
base: R2.20
Choose a base branch
from
Open

R2.20 #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a88abc6
created backup_restore directory in serial scripts
Oct 19, 2015
ebf6ec1
upgraded regular expression to get build_id
Oct 30, 2015
ada3f51
changes to regular expression to get build_id
aswanikumar90 Nov 2, 2015
e801ee7
vn's subnet mask changed from 30 to 28
aswanikumar90 Nov 2, 2015
62fd025
changes to regular expression to get build_id
Nov 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added serial_scripts/backup_restore/base.py
View file
Open in desktop
Empty file.
Empty file added serial_scripts/backup_restore/test_backup_restore.py
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions serial_scripts/upgrade/sdn_topo_with_multi_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def build_topo_project1(self, domain='default-domain', project='project1', usern
self.vnet_list = ['vnet1']
#
# Define network info for each VN:
self.vn_nets = {'vnet1': ['10.1.1.0/30', '11.1.1.0/30']}
self.vn_nets = {'vnet1': ['10.1.1.0/28', '11.1.1.0/28']}
#
# Define netowrk IPAM for each VN, if not defined default-user-created
# ipam will be created and used
Expand Down Expand Up @@ -89,7 +89,7 @@ def build_topo_project2(self, domain='default-domain', project='project2', usern
self.vnet_list = ['vnet2']
#
# Define network info for each VN:
self.vn_nets = {'vnet2': ['12.1.1.0/30', '13.1.1.0/30']}
self.vn_nets = {'vnet2': ['12.1.1.0/28', '13.1.1.0/28']}
#
# Define netowrk IPAM for each VN, if not defined default-user-created
# ipam will be created and used
Expand Down
4 changes: 2 additions & 2 deletions serial_scripts/upgrade/test_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ def test_to_upgrade(self):
status.return_code), 'Failed in running : cd /opt/contrail/utils;fab upgrade_contrail:/tmp/temp/' + rpms

m = re.search(
'contrail-install-packages(.*)([0-9]{2,4})(.*)(_all.deb|.el6.noarch.rpm)', rpms)
build_id = m.group(2)
'contrail-install-packages(_|-)(.*?-)(\d{1,})(.*)(_all.deb|.el6.noarch.rpm)', rpms)
build_id = m.group(3)
status = run(
"contrail-version | grep contrail- | grep -v contrail-openstack-dashboard | awk '{print $1, $2, $3}'")
self.logger.debug("contrail-version :\n %s" % status)
Expand Down