From a88abc6fb7b7539b8093d9acb02a5df8730bf5b5 Mon Sep 17 00:00:00 2001 From: Aswani Kumar Reddy G Date: Mon, 19 Oct 2015 15:30:24 +0530 Subject: [PATCH 1/5] created backup_restore directory in serial scripts --- serial_scripts/backup_restore/base.py | 0 serial_scripts/backup_restore/test_backup_restore.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 serial_scripts/backup_restore/base.py create mode 100644 serial_scripts/backup_restore/test_backup_restore.py diff --git a/serial_scripts/backup_restore/base.py b/serial_scripts/backup_restore/base.py new file mode 100644 index 000000000..e69de29bb diff --git a/serial_scripts/backup_restore/test_backup_restore.py b/serial_scripts/backup_restore/test_backup_restore.py new file mode 100644 index 000000000..e69de29bb From ebf6ec1581cf640e05681b737e0557d35736adf6 Mon Sep 17 00:00:00 2001 From: Aswani Kumar Reddy G Date: Fri, 30 Oct 2015 12:33:19 +0530 Subject: [PATCH 2/5] upgraded regular expression to get build_id --- serial_scripts/upgrade/test_upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serial_scripts/upgrade/test_upgrade.py b/serial_scripts/upgrade/test_upgrade.py index dba427d87..7896973c7 100755 --- a/serial_scripts/upgrade/test_upgrade.py +++ b/serial_scripts/upgrade/test_upgrade.py @@ -441,7 +441,7 @@ 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) + 'contrail-install-packages_(.*?)-([0-9]+)(.*)(_all.deb|.el6.noarch.rpm)', rpms) build_id = m.group(2) status = run( "contrail-version | grep contrail- | grep -v contrail-openstack-dashboard | awk '{print $1, $2, $3}'") From ada3f516d39cbddfa3eb8533c3aee703d1d61d89 Mon Sep 17 00:00:00 2001 From: aswanikumar90 Date: Mon, 2 Nov 2015 14:46:00 +0530 Subject: [PATCH 3/5] changes to regular expression to get build_id --- serial_scripts/upgrade/test_upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serial_scripts/upgrade/test_upgrade.py b/serial_scripts/upgrade/test_upgrade.py index 7896973c7..4cd98d00c 100755 --- a/serial_scripts/upgrade/test_upgrade.py +++ b/serial_scripts/upgrade/test_upgrade.py @@ -441,7 +441,7 @@ 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]+)(.*)(_all.deb|.el6.noarch.rpm)', rpms) + 'contrail-install-packages(_|-)(.*-)(\d{1,})(.*)(_all.deb|.el6.noarch.rpm)', rpms) build_id = m.group(2) status = run( "contrail-version | grep contrail- | grep -v contrail-openstack-dashboard | awk '{print $1, $2, $3}'") From e801ee79f7a5ba1b22fc3451bbda766752f0d801 Mon Sep 17 00:00:00 2001 From: aswanikumar90 Date: Mon, 2 Nov 2015 14:47:59 +0530 Subject: [PATCH 4/5] vn's subnet mask changed from 30 to 28 --- serial_scripts/upgrade/sdn_topo_with_multi_project.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serial_scripts/upgrade/sdn_topo_with_multi_project.py b/serial_scripts/upgrade/sdn_topo_with_multi_project.py index b85ed40a2..bf815509d 100755 --- a/serial_scripts/upgrade/sdn_topo_with_multi_project.py +++ b/serial_scripts/upgrade/sdn_topo_with_multi_project.py @@ -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 @@ -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 From 62fd0252d4343daf93252a3e27b01fcb00405852 Mon Sep 17 00:00:00 2001 From: Aswani Kumar Reddy G Date: Mon, 2 Nov 2015 16:55:00 +0530 Subject: [PATCH 5/5] changes to regular expression to get build_id --- serial_scripts/upgrade/test_upgrade.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serial_scripts/upgrade/test_upgrade.py b/serial_scripts/upgrade/test_upgrade.py index 4cd98d00c..a48b9ab90 100755 --- a/serial_scripts/upgrade/test_upgrade.py +++ b/serial_scripts/upgrade/test_upgrade.py @@ -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(_|-)(.*-)(\d{1,})(.*)(_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)