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 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 diff --git a/serial_scripts/upgrade/test_upgrade.py b/serial_scripts/upgrade/test_upgrade.py index dba427d87..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(.*)([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)