Merge pull request #1298 from remibergsma/staticroute_delete_47 CLOUDSTACK-9204 Do not error when staticroute is already goneWhen deleting a static route fails because it isn't there any more (KeyError), it should succeed instead.
Error seen: ``` [INFO] Processing JSON file static_routes.json.1451560145 Traceback (most recent call last): File "/opt/cloud/bin/update_config.py", line 140, in <module> process_file() File "/opt/cloud/bin/update_config.py", line 52, in process_file qf.load(None) File "/opt/cloud/bin/merge.py", line 258, in load proc = updateDataBag(self) File "/opt/cloud/bin/merge.py", line 91, in _init_ self.process() File "/opt/cloud/bin/merge.py", line 131, in process dbag = self.process_staticroutes(self.db.getDataBag()) File "/opt/cloud/bin/merge.py", line 179, in process_staticroutes return cs_staticroutes.merge(dbag, self.qFile.data) File "/opt/cloud/bin/cs_staticroutes.py", line 26, in merge del dbag[key] KeyError: u'192.168.0.3' ``` * pr/1298: CLOUDSTACK-9204 Do not error when staticroute is already gone Signed-off-by: Remi Bergsma <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b4ebfb64 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b4ebfb64 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b4ebfb64 Branch: refs/heads/master Commit: b4ebfb640e4514e45190846965b4a6a77bb3ae8a Parents: 317c28a 779f4b3 Author: Remi Bergsma <[email protected]> Authored: Sat Jan 16 19:43:24 2016 +0100 Committer: Remi Bergsma <[email protected]> Committed: Sat Jan 16 19:43:24 2016 +0100 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
