#!/usr/bin/python
#
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010, 2012 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
def _RunUpgrade(path, dry_run, no_verify, ignore_hostname=True):
cmd = [sys.executable, "%s/tools/cfgupgrade" % testutils.GetSourceDir(),
- "--debug", "--force", "--path=%s" % path]
+ "--debug", "--force", "--path=%s" % path, "--confdir=%s" % path]
if ignore_hostname:
cmd.append("--ignore-hostname")
self.confd_hmac_path = utils.PathJoin(self.tmpdir, "hmac.key")
self.cds_path = utils.PathJoin(self.tmpdir, "cluster-domain-secret")
self.ss_master_node_path = utils.PathJoin(self.tmpdir, "ssconf_master_node")
+ self.file_storage_paths = utils.PathJoin(self.tmpdir, "file-storage-paths")
def tearDown(self):
shutil.rmtree(self.tmpdir)
utils.WriteFile(self.config_path, data=serializer.DumpJson({
"version": constants.CONFIG_VERSION,
"cluster": {},
+ "instances": {},
}))
hostname = netutils.GetHostname().name
utils.WriteFile(self.config_path, data=serializer.DumpJson({
"version": constants.CONFIG_VERSION,
"cluster": {},
+ "instances": {},
}))
utils.WriteFile(self.ss_master_node_path,
"cluster": {
"config_version": 0,
},
+ "instances": {},
}
utils.WriteFile(self.config_path, data=serializer.DumpJson(cfg))
self.assertRaises(Exception, _RunUpgrade, self.tmpdir, False, True)
utils.WriteFile(self.config_path, data=serializer.DumpJson({}))
self.assertRaises(Exception, _RunUpgrade, self.tmpdir, False, True)
- def _TestSimpleUpgrade(self, from_version, dry_run):
+ def _TestSimpleUpgrade(self, from_version, dry_run,
+ file_storage_dir=None,
+ shared_file_storage_dir=None):
+ cluster = {}
+
+ if file_storage_dir:
+ cluster["file_storage_dir"] = file_storage_dir
+ if shared_file_storage_dir:
+ cluster["shared_file_storage_dir"] = shared_file_storage_dir
+
cfg = {
"version": from_version,
- "cluster": {},
+ "cluster": cluster,
+ "instances": {},
}
self._CreateValidConfigDir()
utils.WriteFile(self.config_path, data=serializer.DumpJson(cfg))
for path in [self.rapi_users_path, self.rapi_users_path_pre24]:
self.assertEqual(utils.ReadFile(path), "hello world\n")
+ def testFileStoragePathsDryRun(self):
+ self.assertFalse(os.path.exists(self.file_storage_paths))
+
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 6, 0), True,
+ file_storage_dir=self.tmpdir,
+ shared_file_storage_dir="/tmp")
+
+ self.assertFalse(os.path.exists(self.file_storage_paths))
+
+ def testFileStoragePathsBoth(self):
+ self.assertFalse(os.path.exists(self.file_storage_paths))
+
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 6, 0), False,
+ file_storage_dir=self.tmpdir,
+ shared_file_storage_dir="/tmp")
+
+ lines = utils.ReadFile(self.file_storage_paths).splitlines()
+ self.assertTrue(lines.pop(0).startswith("# "))
+ self.assertTrue(lines.pop(0).startswith("# cfgupgrade"))
+ self.assertEqual(lines.pop(0), self.tmpdir)
+ self.assertEqual(lines.pop(0), "/tmp")
+ self.assertFalse(lines)
+ self.assertEqual(os.stat(self.file_storage_paths).st_mode & 0777,
+ 0600, msg="Wrong permissions")
+
+ def testFileStoragePathsSharedOnly(self):
+ self.assertFalse(os.path.exists(self.file_storage_paths))
+
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 5, 0), False,
+ file_storage_dir=None,
+ shared_file_storage_dir=self.tmpdir)
+
+ lines = utils.ReadFile(self.file_storage_paths).splitlines()
+ self.assertTrue(lines.pop(0).startswith("# "))
+ self.assertTrue(lines.pop(0).startswith("# cfgupgrade"))
+ self.assertEqual(lines.pop(0), self.tmpdir)
+ self.assertFalse(lines)
+
def testUpgradeFrom_2_0(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 0, 0), False)
def testUpgradeFrom_2_4(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 4, 0), False)
+ def testUpgradeFrom_2_5(self):
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 5, 0), False)
+
+ def testUpgradeFrom_2_6(self):
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 6, 0), False)
+
def testUpgradeCurrent(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, False)
def testUpgradeDryRunFrom_2_4(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 4, 0), True)
+ def testUpgradeDryRunFrom_2_5(self):
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 5, 0), True)
+
+ def testUpgradeDryRunFrom_2_6(self):
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 6, 0), True)
+
def testUpgradeCurrentDryRun(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, True)