3008ce38ee
Replacing the old [Vpc}VirtualNetworkApplianceManager by the new ones;
...
Implement the missing commands related to DHCP PV Lan and DHCP SubNet
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/DhcpRules.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.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
server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java
2014-10-03 06:21:26 +02:00
440089c3f5
License headers
2014-10-03 06:21:26 +02:00
d0467731de
More refactoring and testing in the same classes
...
Conflicts:
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
2014-10-03 06:21:26 +02:00
3f021625a2
RouterDeployment and VPC. Improving code and Unit Testing
2014-10-03 06:21:26 +02:00
70644157c5
Splitting Vpc and NonVpc deployment into phases & testing it
2014-10-03 06:21:26 +02:00
6e2cb08375
fixing VPC IP Association and ACL rules. Have to rewrite in a better why the apply rules method in the Advanced Topology
2014-10-03 06:21:26 +02:00
acc3f23645
apply network acls; acls items to pvt gw; vpc ip association
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-03 06:21:26 +02:00
8a1462c9cc
Fixing null pointers during vpc router deployment
2014-10-03 06:21:26 +02:00
6852f31271
adding new bean to spring context file; renaming package from "com" to "org"
2014-10-03 06:21:26 +02:00
ea34c11d83
removing bean from the xml
2014-10-03 06:21:26 +02:00
83a2cd945c
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
2014-10-03 06:21:26 +02:00
4ae9e67a5b
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
2014-10-03 06:21:26 +02:00
e6b1a3c7e4
replacing my IP by localhost to avoid problems with my environment
2014-10-03 06:21:26 +02:00
09763596d0
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
2014-10-03 06:21:26 +02:00
7de179d464
fixing the injection of the networkDao
...
Conflicts:
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
2014-10-03 06:21:25 +02:00
0c2051b5f1
whitespace
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
2014-10-03 06:21:25 +02:00
66aec9a808
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
2014-10-03 06:21:25 +02:00
d86f589a1c
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
2014-10-03 06:21:25 +02:00
017aac9c23
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
2014-10-03 06:21:25 +02:00
2b95723adb
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
2014-10-03 06:21:25 +02:00
d306dfc194
Unify and encapsulate deployment flow methods and params
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-03 06:21:25 +02:00
b14f42665e
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
2014-10-03 06:21:25 +02:00
514beef30e
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
2014-10-03 06:21:25 +02:00
3d16a407c9
Temporary put state info in a state object
2014-10-03 06:21:25 +02:00
0a08829153
package rename
...
Conflicts:
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/com/cloud/network/rules/DhcpSubNetRules.java
2014-10-03 06:21:25 +02:00
6188adb970
Fix offering setup
2014-10-03 06:21:25 +02:00
5b60394a3a
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
2014-10-03 06:21:25 +02:00
91dfad4a97
adding apache license headers
2014-10-03 06:21:25 +02:00
7b59dce792
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.
2014-10-03 06:21:24 +02:00
00f39e6b51
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
2014-10-03 06:21:24 +02:00
08cf6b11a1
TODO
2014-10-03 06:21:24 +02:00
1365acd200
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
2014-10-03 06:21:24 +02:00
b56b62b9d4
fixing checkstyles
...
Conflicts:
server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
server/src/com/cloud/network/topology/BasicNetworkTopology.java
2014-10-03 06:21:24 +02:00
5f5bbe1988
changing accessor modifier in instance variables
2014-10-03 06:21:24 +02:00
db844438b4
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
2014-10-03 06:21:24 +02:00
705ced3a84
Fix dependency problem. Extract and unify router deployment stuff
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-03 06:21:24 +02:00
bca81b0573
Extract general behavior to Router and Vpc delegates
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-03 06:21:24 +02:00
105ee89f47
Rules and visitors for Load Balance Rules
...
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
2014-10-03 06:21:24 +02:00
97768b2657
CLOUDSTACK-7668: UI > When UI is loaded the first time, sometimes a blank screen instead of a login screen shows > fix it by declaring the variables beforehand.
2014-10-02 17:07:57 -07:00
3201251256
ccp should not check public ip resource when deploy a vm on shared network
2014-10-02 16:03:34 -07:00
53d5e8af18
CLOUDSTACK-7668: UI > When UI is loaded the first time, sometimes a blank screen instead of a login screen shows. Only after clicking Refresh button(i.e. loaded again) will the login screen show.
2014-10-02 14:43:22 -07:00
0ef6cd36c4
Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect"
...
This reverts commit 39fe766c2b
2014-10-02 13:28:52 -07:00
53db8c725c
Revert "Remove adding implicit tags in DB schema so that management server starts, original commit 39fe766c2b needs review"
...
This reverts commit 597d3d7037
2014-10-02 13:27:59 -07:00
dfe2bfefb1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
2014-10-02 11:18:54 -07:00
597d3d7037
Remove adding implicit tags in DB schema so that management server starts, original commit 39fe766c2b needs review
2014-10-02 11:18:41 -07:00
0646588fc6
CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances of "???label.*???"
...
- removed duplicate entries in dictionary
- added dictionary entries that have been missed during the dictionary split
- added missing entries in messages.properties
- fixed other localization issues
2014-10-02 10:51:52 -07:00
d46251fab6
Merge branch 'bugfix/CS-7665'
2014-10-02 09:59:08 +02:00
fe325ab576
CLOUDSTACK-7624 The value field of the configuration table is not big enough for some values
...
(cherry picked from commit 9eb86560c9
2014-10-02 09:58:45 +02:00
47ac3e4fd1
CLOUDSTACK-7665 File.separator shouldn't be used in this case, the
...
separator is fixed just like the rest of the path
2014-10-02 09:54:53 +02:00
70efe1507c
added more log for create vm snapshot
2014-10-01 16:18:28 -07:00
Wilder Rodrigues
Antonio Fornie
Daan Hoogland
Wilder Rodrigues
Jessica Wang
Anthony Xu
amoghvk
Mihaela Stoica
Hugo Trippaers