GitHub user DaanHoogland opened a pull request:
https://github.com/apache/cloudstack/pull/22
Vpc refactor clean for pr
maybe wait with merging untill 4.5 is branched of. On the other hand we cn
branch below this refatoring as well
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/schubergphilis/cloudstack
vpc-refactor-clean-for-PR
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/22.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #22
----
commit 105ee89f47622bff0f6ad6c12af91b5842c4cc48
Author: Antonio Fornie <afor...@schubergphilis.com>
Date: 2014-07-03T17:17:26Z
Rules and visitors for Load Balance Rules
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
commit bca81b05737afe4861b6f588662314af9010ff4f
Author: Antonio Fornie <afor...@schubergphilis.com>
Date: 2014-07-10T14:54:01Z
Extract general behavior to Router and Vpc delegates
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
commit 705ced3a84cbdbbe82394f0e2651b9c74207caf1
Author: Antonio Fornie <afor...@schubergphilis.com>
Date: 2014-07-11T13:07:35Z
Fix dependency problem. Extract and unify router deployment stuff
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
commit db844438b4bbc97de1fc13113cddd24fde113233
Author: Wilder Rodrigues <wilder@ekhos-01.ekhos-01>
Date: 2014-07-13T12:34:23Z
Adding Firewall Rules to comply with the Visitor pattern implementation;
refactoring the applyRules so we can reuse it.
Conflicts:
server/src/com/cloud/network/rules/LoadBalancingRules.java
server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
server/src/com/cloud/network/topology/BasicNetworkTopology.java
server/src/com/cloud/network/topology/NetworkTopology.java
commit 5f5bbe1988613e5ced9943fef2125166ce7eb447
Author: Wilder Rodrigues <wilder@ekhos-01.ekhos-01>
Date: 2014-07-14T09:34:48Z
changing accessor modifier in instance variables
commit b56b62b9d4db404c10980ab93ac3d6845177863e
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-14T09:52:51Z
fixing checkstyles
Conflicts:
server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
server/src/com/cloud/network/topology/BasicNetworkTopology.java
commit 1365acd2009dc44e395aab440c60a2a945aca1d4
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-14T14:20:28Z
finished firewall rules and load balancing rules; fixed all the injection
problems; added VirtualMachineManager to the appliance factory to be injected.
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/router/NEWVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/topology/BasicNetworkTopology.java
commit 08cf6b11a18d6c1ddcef3341e31114020257c0d0
Author: Daan Hoogland <d...@onecht.net>
Date: 2014-07-14T15:50:27Z
TODO
commit 00f39e6b51860a00d6fc756e97ba54293c2c7985
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-14T17:36:29Z
adding static nat rules. Deploying new VMs is not working due to the
appliance refactory, will check the changes with Antonio tomorrow.
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
commit 7b59dce792fabab00728a888c1acd43d8fd35943
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-15T07:23:26Z
we have to check if VPC is null bfore calling it. VPC is not used in gest
networks, so deploying a new VM was broken.
commit 6188adb9702a2001bd9f53bacf1eeccea57de7b7
Author: Antonio Fornie <afor...@schubergphilis.com>
Date: 2014-07-15T09:06:44Z
Fix offering setup
commit 3d16a407c97d877b96d765bb6dd0cade211e976b
Author: Antonio Fornie <afor...@schubergphilis.com>
Date: 2014-07-15T09:54:58Z
Temporary put state info in a state object
commit 91dfad4a9789bf00ce89ee396964c2d003631202
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-15T07:38:21Z
adding apache license headers
commit 5b60394a3a0d3a373094cdae9aaaa1640c71d223
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-15T08:59:42Z
adding Ip Association and VPN Rules
Conflicts:
server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
server/src/com/cloud/network/topology/BasicNetworkTopology.java
server/src/com/cloud/network/topology/NetworkTopologyVisitor.java
commit 0a08829153d0911b2231b77b88a8c40365504415
Author: Daan Hoogland <d...@onecht.net>
Date: 2014-07-15T09:28:49Z
package rename
Conflicts:
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/com/cloud/network/rules/DhcpSubNetRules.java
commit d306dfc194d5913e20642af13c26817d7b11fb2e
Author: Antonio Fornie <afor...@schubergphilis.com>
Date: 2014-07-15T16:52:54Z
Unify and encapsulate deployment flow methods and params
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
commit 514beef30e749b93d27daffd975f85f7ad226201
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-15T11:50:37Z
fixing the classes relationship; adding beans properly in the spring
context; using the right basic/advance stuff; testing ip and port forwarding
rules
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
commit b14f42665ed586737eca6245d56d38846c1f7725
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-15T13:56:02Z
adding password to router rules; moving the advance code to the advance net
topology.
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
commit 2b95723adb93d10e710de91d4a0c35d48b93f3c5
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-16T05:38:33Z
adding userdata to router and ssh pub key to router rules.
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
commit 017aac9c2391f5b24b1f5dea518b8e96e048abfc
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-16T06:20:52Z
making instance variables compliant with ACS convention
Conflicts:
server/src/com/cloud/network/rules/LoadBalancingRules.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
commit d86f589a1cccf02d182171b667c87835cff94a93
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-16T07:30:10Z
adding user data pwd rules
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
commit 66aec9a8080ab229ac433f1095631efa492f3b79
Author: wrodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-16T13:01:59Z
fixing injection of beans with a relationship
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
commit 0c2051b5f1bc73d99dfc00cb4156bfbb6c249002
Author: Daan Hoogland <d...@onecht.net>
Date: 2014-07-16T14:57:54Z
whitespace
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
commit 7de179d464e38585a29e70c1b7a18f313d3ac942
Author: wrodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-16T15:43:09Z
fixing the injection of the networkDao
Conflicts:
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
commit 09763596d0399f32c5acbbed055572eaf4830d28
Author: Antonio Fornie <afor...@schubergphilis.com>
Date: 2014-07-16T17:11:47Z
Deployment more OO - Objects with data and behavior
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
commit 8a1462c9cc345b9759abb412c5a4b97ec6d8230b
Author: Antonio Fornie <afor...@schubergphilis.com>
Date: 2014-07-17T09:51:46Z
Fixing null pointers during vpc router deployment
commit e6b1a3c7e4b5cfbb7b34723d922476895990ef15
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-17T05:41:59Z
replacing my IP by localhost to avoid problems with my environment
commit 70644157c5f2bda1eb649a1c1cb724ba94e8895e
Author: Antonio Fornie <afor...@schubergphilis.com>
Date: 2014-07-17T12:48:20Z
Splitting Vpc and NonVpc deployment into phases & testing it
commit 4ae9e67a5b13b90bae35c1e1c77d35cf2aac9592
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-17T05:57:29Z
fixing import in virtual router element and checkstyle in dhcp entry
related changes
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
commit 83a2cd945cfea714ecbc164606272e7ac7d5f13c
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2014-07-17T06:36:46Z
commenting broken code in tests in order to run build adn tests other
changes via the UI
Conflicts:
server/test/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
