26426 Commits

Author SHA1 Message Date
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
Hugo Trippaers
4632936733 We actually don't need all the process stuff 2015-03-16 11:38:05 +01:00
Antonio Fornie
09bd847040 Vpc redundancy enabled. Including Vpc & Vpc Offering creation. Marvin tests and UI. 2015-03-16 11:38:05 +01:00
afornie
c4de33d682 Fix compilation problem only visible upon simulator build 2015-03-16 11:35:38 +01:00
Hugo Trippaers
39035f4782 Fix test cases now ConfigHelper is gone 2015-03-16 11:35:38 +01:00
Hugo Trippaers
a9c5f91223 Fix indents 2015-03-16 11:35:37 +01:00
Ian Southam
ba4684d53d Updated incorrect file.
This led to the file loading twice
2015-03-16 11:35:37 +01:00
Ian Southam
e30da35879 Interfaces were not coming up on non redundant router 2015-03-16 11:35:37 +01:00
Hugo Trippaers
0a95c44c51 ConfigHelper is replace by a facade pattern 2015-03-16 11:35:36 +01:00
Hugo Trippaers
4cfe2a32c0 Fix a few things introduced by the rebase 2015-03-16 11:35:35 +01:00
Leo Simons
9166848482 Stop using rvm 2015-03-16 11:35:35 +01:00
Leo Simons
d0281a3b41 Seems like some of these can be nil 2015-03-16 11:35:35 +01:00
wilderrodrigues
0a1677242a Adding tests for IpAssocVpc; DeleteIpAlias; DnsMasqConfig
Adding IpAssocVpcCommand to the AbstractConfigItemFacade map
2015-03-16 11:35:34 +01:00
wilderrodrigues
6d7f75e18b Adding LoadBalancer command to JSON style
Adding a couple of tests (ConfigHelperTest) to validate the following:

* Command is generated;
* JSON String is generated based on the Java Object
* JSON Object is generated based on the String content

Also fixed the SetPortForwardingRulesVpcConfigItem: implementation was missing.
2015-03-16 11:35:33 +01:00
wilderrodrigues
6898acd349 BumpUpPriotity doesn't need the generateConfigItems() method.
Its approach is different, it uses a non-parameterized script.
2015-03-16 11:35:33 +01:00
wilderrodrigues
8caafe2859 Adding all other (13) rules to the new code design
Removed the code from ConfigHelper, which is now really clean
Added Flyweight to AbstractConfigItemFacada
Renamed 3 *ConfigItem classes that had typos in their names
2015-03-16 11:35:33 +01:00
wilderrodrigues
7ccd174471 Add 8 Commands/ConfigItems to new style
Make subclasses extend the abstract class; change accessor of few methods
2015-03-16 11:35:32 +01:00
wrodrigues
36a95e7577 TK-2925 Add support for loadbalancer config in ConfigHelper
Adding new ConfigItem classes, that will be used to decouple the configureation from the ConfigHelper class.

The idea is to use mix of Flyweight and Facade implementation in order to the correct classes without having so many ifs and private static methods.
2015-03-16 11:35:31 +01:00
Ian Southam
55c008f569 Cockup during the adding of the Apache licence 2015-03-16 11:35:31 +01:00
Ian Southam
f0b783bb11 Removed stuff that is moved to CsRedundant 2015-03-16 11:35:30 +01:00
Ian Southam
7b95b78223 backup fault and master implemented
Some more refactoring to decluter the bin directory
New config class to carry around the log, command line and firewall data
2015-03-16 11:35:29 +01:00
Ian Southam
8a2391336c Getting redundancy to work via teh configuration files
Some refactoring to make class loading a little more logical
Removed fw global (does not persist accross modules)
Added first tests
Added command line call to set and disable redundancy
Added command line call to set master
2015-03-16 11:35:29 +01:00
Ian Southam
093749eaae A start on the redundancy code
This will not break anything but also will not work
2015-03-16 11:35:29 +01:00
Ian Southam
a01e9082cd New code for ACLs (VPN configuration) failed functional tests
Some corrections
2015-03-16 11:35:28 +01:00
Ian Southam
f7d0a11a34 Process VPN requests\
No tests (yet)
2015-03-16 11:35:28 +01:00
Ian Southam
b95d8257a4 Merge operation for site2site vpn 2015-03-16 11:35:28 +01:00
Ian Southam
725c040d5c Added code to configure netusage for vpc and domR devices
Removed code from existing scripts that does the same
Fixed some more issues with CsNetfilter
Added rsync for/etc/iptables in rsync
2015-03-16 11:35:27 +01:00
Ian Southam
56900434b4 Added some new tests to check the acls are being made sort of correctly 2015-03-16 11:35:27 +01:00
Ian Southam
fa3ecbe8a0 Add some parameters to make nose a little less chatty
Well to be accurate to make fabric a little less chatty
2015-03-16 11:35:27 +01:00
Ian Southam
3cdaa55462 icmp-type parameter was being skipped 2015-03-16 11:35:27 +01:00
Ian Southam
2765a506dc Moved databag into a separate file 2015-03-16 11:35:26 +01:00
Ian Southam
733bc19eac Include base rule sets in Acls
Also made some adjustments to the base rule sets to ensure my parsing routine works
2015-03-16 11:35:26 +01:00
Ian Southam
e779c9b1e3 Some new tests for the acl code
WIP:  Committed to reduce chances of conflicts
2015-03-16 11:35:26 +01:00
Hugo Trippaers
a7338387c1 Sourcenat is handled differently for routers and vpc routers 2015-03-16 11:35:26 +01:00
Hugo Trippaers
576564e744 If a file doesn't exist, create it 2015-03-16 11:35:26 +01:00
Ian Southam
762e05ddee Bug fixed:
Default drop rul for inbound chain gets dropped by CsNetFilter
This would have been bad (tm)
2015-03-16 11:35:25 +01:00
Ian Southam
8b38bff962 A lot of corner cases dealt with
Need now to expand the test data to ensure I have got them all
Also failure to match because bizarrely some strings were unicode and some not
2015-03-16 11:35:25 +01:00