etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/systemvm
History
Remi Bergsma b4ebfb640e 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 <github@remi.nl>
 		2016-01-16 19:43:24 +01:00
..
bindir Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
certs Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
conf CLOUDSTACK-9062: Improve S3 implementation. 2015-11-19 15:29:10 +01:00
conf.dom0 CLOUDSTACK-9105: Logging enhancement: Handle/reference to track API calls end to end in the MS logs 2015-12-04 12:45:57 +05:30
css console-proxy add support of AltGr key and FR azerty keyboard 2014-12-08 18:05:43 +05:30
distro CLOUDSTACK-6220: Take 2, Fix cloudstack init scripts so that they 2014-03-10 16:11:52 -06:00
images Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
js console-proxy add support of AltGr key and FR azerty keyboard 2014-12-08 18:05:43 +05:30
libexec Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
patches/debian Merge pull request #1298 from remibergsma/staticroute_delete_47 2016-01-16 19:43:24 +01:00
scripts Merge branch 'volume-upload' into master 2015-04-29 11:12:53 +05:30
test/python Fixed defaultroute on VPC routers in CsRoute and CsAddress 2015-08-24 13:35:29 +02:00
ui Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
vm-script Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
pom.xml Updating pom.xml version numbers for release 4.7.1-SNAPSHOT 2015-12-21 19:55:04 +01:00
systemvm-descriptor.xml Remove duplicate scripts and move the remaining items to the systemvm project 2013-10-14 08:02:35 +02:00