888 Commits

Author SHA1 Message Date
wilderrodrigues
edd839ab10 Fix: allow multiple VIFs per Mac Address
Fix: RTNETLINK errors
     - Management Server health check trying to create already existing interface
     - Changes on update_config.py, cs_guestnetwork.py, merger.py
Fix: replace RRouTER_LOG in the CsRedundant.py per log file location
Fix: Guest Net address association during Router restart
     - Changes on NicProfileHelper, NicProfileHelperImpl
Fix: aggregationExecution() method on VirtualNetworkApplianceManagerImpl
     - Do not send an AggregationControlCommand to a non-configured router

Some classes have been formatted.
2015-03-16 11:39:48 +01:00
wilderrodrigues
460204fa9f Fixing CsDhcp.py
Fixing assign IPv4 on GuestNetworkGuru.java
Fixing getRouters() on VpcVirtualRouterElement.java
Fixing Fixing paths on keepalived.conf.templ

Refactor on the other files
2015-03-16 11:39:17 +01:00
wilderrodrigues
ddbc565bc4 Log an error when removing keepalived.strikes file and it doesn't exit. 2015-03-16 11:39:17 +01:00
wilderrodrigues
40eb579115 TK-3135 fixes for VPC restart
* removed the "is redundant" flag form the addVpcRouterToGuestNetwork() method
* removed the "is redundant" flag from the removeVpcRouterFromGuestNetwork() method
* changed the path of the master.py file in the keepalived.conf.temp file
* the call to routerDao.addRouterToGuestNetwork() in the VpcRouterDeploymentDefinition is not needed. That step will be performed once a VM is created
  - In addition, when restarting a VPC the routers will have the guest net configured, if any exists.

* Pushing the POM.xml as well, to use the old Jetty for now. Could not fix the logging problem. Will replace the POM with master version after VPC is done.
2015-03-16 11:39:17 +01:00
wilderrodrigues
35151961be Fixing call on AclIP class. Instead of self.fw = fw we have to do self.fw = fw.get_fw()
Fixing the master.py path in the keepalived.conf.templ
2015-03-16 11:39:16 +01:00
wilderrodrigues
84bf46dc2f Java: Fixing the redundant flag for the router control nic and the guest network command;
Python: fix the redundant setup in the CsRedundant class
2015-03-16 11:39:15 +01:00
wilderrodrigues
3b6f247d40 Fix problem with reading invalid key form the dictionary
I did in the same way Ian did for other files, but we have to find a better way to fix it.
2015-03-16 11:39:15 +01:00
wilderrodrigues
370fe518f2 Fixing delete_leases function.
It was refering a non-existing variable.
2015-03-16 11:39:14 +01:00
Ian Southam
636dfd6217 New unit test
Some stupid typos
pep8
2015-03-16 11:39:14 +01:00
Ian Southam
406af7e855 Sorting out redundancy
some new unit testing
stupid bug in CsCmdLine refactor
2015-03-16 11:39:14 +01:00
Ian Southam
bdda01d269 Countless bug fixes, mostly do do with VR redundancy
Also added some new unit tests and adjusted the code to make them work
2015-03-16 11:38:18 +01:00
Ian Southam
24c8de3c13 Some convenience methods 2015-03-16 11:38:17 +01:00
Ian Southam
8a6a407114 Dhcp refactor
Loads of tiny bugs squashed and some big ones
Tested with domR needs VPC testing now
TODO:  Unit tests CsDhcp
2015-03-16 11:38:17 +01:00
Ian Southam
31266d354f Broken code during guest network merge 2015-03-16 11:38:17 +01:00
Hugo Trippaers
75dda0b5b2 Fix imports 2015-03-16 11:38:17 +01:00
Ian Southam
40eb8423b9 Fixed hostname on router 2015-03-16 11:38:16 +01:00
Ian Southam
d89c1e28ab Forgot to add append method 2015-03-16 11:38:16 +01:00
Ian Southam
ec09f04b88 Small bug 2015-03-16 11:38:16 +01:00
Ian Southam
84624091fd Load balancer config 2015-03-16 11:38:16 +01:00
Ian Southam
7d0df32560 Lots of fixes from the testing
firewallrules implemented sperately from networkacl (ugly but best that can be done ATM)
Some refactoring in CsDHCP as it made no sense to do it that way anymore
processmonitoring implemented
Domain not correctly sourced in VR
2015-03-16 11:38:15 +01:00
Ian Southam
08d2e10cb9 pep8 2015-03-16 11:38:15 +01:00
Ian Southam
0496ba7a00 firewallrules (VR) and metworkacl (VPC) did not as I believe they shgould get combined
in the underlying java code
Have split them out again.
Omce tested this will need some refactorinfg because it is currently PFU
2015-03-16 11:38:15 +01:00
Ian Southam
f924a9755d Adding port forwarding ranges exposes a rather unfortunate typo 2015-03-16 11:38:15 +01:00
Ian Southam
467374c981 This time after running the unittests <blush> 2015-03-16 11:38:14 +01:00
Ian Southam
cca4b58d50 A couple of firewall fixes for DomRouter code 2015-03-16 11:38:14 +01:00
wilderrodrigues
099add4fd6 Removing "global" declaration from if block
In python an "if" block doesn't change the scope. So, global not needed as it was creating an warning.
2015-03-16 11:38:13 +01:00
wilderrodrigues
185975f6ac Adding [ERROR] tag before error message to ease identification 2015-03-16 11:38:13 +01:00
Hugo Trippaers
67ee33ff8a More pep8 checks and fixes 2015-03-16 11:38:12 +01:00
Hugo Trippaers
5c4d221c34 Let's stick to CamelCase for now 2015-03-16 11:38:12 +01:00
Hugo Trippaers
e10545506d Add boilerplates for module unittests 2015-03-16 11:38:12 +01:00
Hugo Trippaers
628af2f973 Get started with some tests on the python code 2015-03-16 11:38:11 +01:00
Ian Southam
6b0c40ed3e iAdd chains before provisioning rules 2015-03-16 11:38:11 +01:00
Ian Southam
50ee12c6e3 Corrected basic firewalling setup 2015-03-16 11:38:10 +01:00
Ian Southam
13b7ca1b3f New code must not run on systemvm 2015-03-16 11:38:10 +01:00
Ian Southam
4cdaada380 Bugger 2015-03-16 11:38:10 +01:00
Ian Southam
dce2c9e35a Syntax error 2015-03-16 11:38:10 +01:00
Ian Southam
092c8924c9 Bug corrections 2015-03-16 11:38:09 +01:00
Ian Southam
5249df8799 Splitting router and vpc 2015-03-16 11:38:09 +01:00
Ian Southam
99d7c8f457 Fix syntax error 2015-03-16 11:38:09 +01:00
Ian Southam
945cc0bcfb Aligning router chain names correctly 2015-03-16 11:38:08 +01:00
Hugo Trippaers
a2e7f30542 Fix license headers 2015-03-16 11:38:08 +01:00
Hugo Trippaers
18f517a8b1 pep8 2015-03-16 11:38:08 +01:00
Hugo Trippaers
9385f071d7 Fix PEP8 compliance 2015-03-16 11:38:07 +01:00
Hugo Trippaers
acaeec9a27 Fix indent 2015-03-16 11:38:07 +01:00
Ian Southam
5dcdf26328 Typo 2015-03-16 11:38:07 +01:00
Ian Southam
54f5c53a20 Decided not at this stage to combine VPC and VR code 2015-03-16 11:38:06 +01:00
Hugo Trippaers
0afe0153a7 Fix tab characters 2015-03-16 11:38:06 +01:00
Ian Southam
2f8352bf96 Daft mistake that left more data getting merged than we would have liked 2015-03-16 11:38:06 +01:00
Hugo Trippaers
76d0669656 Avoid confusion and make sure the file is put in only one location 2015-03-16 11:38:06 +01:00
Hugo Trippaers
01acd3d8ec VR interfaces need the proper network type in ips 2015-03-16 11:38:05 +01:00