a72580def0
CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed.
...
(cherry picked from commit 287ff83552
2014-10-20 16:50:22 -07:00
622041b513
rats
2014-10-17 11:56:07 +02:00
1de0cb7094
restore barematel work after merge
2014-10-17 10:24:01 +02:00
148efbb73f
Merge remote-tracking branch 'origin/4.5' into merge-master
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
setup/db/db/schema-441to450.sql
test/integration/component/test_deploy_vgpu_vm.py
tools/marvin/marvin/config/test_data.py
2014-10-16 12:29:37 +02:00
1f8cf0bee4
CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.
2014-10-16 14:38:33 +05:30
ec6a666855
Config value having different category in SQL and Config.java.
2014-10-16 14:38:23 +05:30
420d4e0da0
CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.
2014-10-16 14:25:30 +05:30
5025071954
Config value having different category in SQL and Config.java.
2014-10-16 14:01:23 +05:30
80e0c99189
Removed duplicate code and unused imports which was causing build failure.
2014-10-16 13:53:32 +05:30
efe1e0a544
Fixed coverity and other resource leak issues
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-10-16 12:19:51 +05:30
53ee4cd794
CLOUDSTACK-7728: Removed duplicate import
2014-10-16 10:05:06 +05:30
7fe3c45142
CLOUDSTACK-7729: listVMSnapshot API not returning parent id in response
2014-10-16 09:43:04 +05:30
e257c13f16
CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot
2014-10-16 09:38:21 +05:30
f488a8f72c
CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes
2014-10-16 09:38:21 +05:30
080bc2e2e9
CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.
...
Signed-off-by: Jayapal <jayapal@apache.org>
2014-10-16 09:38:21 +05:30
55e11cddca
CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot
2014-10-16 09:37:43 +05:30
7cd3438580
CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes
2014-10-16 09:37:42 +05:30
6967c6c229
CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.
...
Signed-off-by: Jayapal <jayapal@apache.org>
2014-10-16 09:37:42 +05:30
3b442acdd7
CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller
...
(cherry picked from commit 42f628c61c
2014-10-15 13:58:22 -07:00
42f628c61c
CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller
2014-10-15 13:53:39 -07:00
e70dde09c9
Implementing snapshot-strategy support for reverting a volume to a snapshot
2014-10-14 22:04:18 -06:00
35a8b70799
Adding a snapshot strategy for systems that want to take snapshots that reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to secondary storage)
2014-10-14 12:26:40 -06:00
771d052381
Merge branch 'vpc-refactor-clean-for-PR' of https://github.com/schubergphilis/cloudstack
2014-10-14 20:14:50 +02:00
1e87d7b266
Fixing checkstyle.
...
Making local variable compatible with our checkstyle settings.
2014-10-14 15:25:50 +02:00
2ed64b2356
Applying fix from commit id 6b8e0baa21
...
Changes by Edilson Su: if vpc public network with snat enabled, then will triger this issue.
2014-10-14 15:10:14 +02:00
db86bdfb2c
Applygin fix from commit ID aaeadc5c44
...
Sheng Yang changed 2 classes, ut only one was related to the bug CLOUDSTACK-7605.
I applied the changed on the routerslist, used during the deployment of the virtual routers.
Tested Advanced Zone against the simulator. 69 happy tests in place
2014-10-14 15:08:13 +02:00
c81b3380df
Applying the latest chances from the VPC Refactor branch onto the new one.
...
We will keep this branch as clean as possible to avoid problems with merge.
2014-10-14 15:08:13 +02:00
3ac2e222e8
CLOUDSTACK-6278 Baremetal Advanced Networking support from commit id e06fa18ed2 by Frank Zhang
...
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
2014-10-14 15:08:13 +02:00
4e21948f5c
Fixing the NetworkHelperImpl class. It was throwing a NPE due to a hypervisor type SIMULATOR not being in the hashmap.
...
When the refactor took place, we should have changed first structure, then behaviour. By refactoring the deployRouter method
we changed how the templateName was retrieved.
Fixed and tested using the simulator and the following Marvin tests
test_privategateway_acl
test_routers
test_vpc_vpn
test_service_offerings
test_volumes
test_reset_vm_on_reboot
test_multipleips_per_nic
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
2014-10-14 15:08:12 +02:00
025ff72410
fixing checkstyle in the virtual network manager. problem appeared after a rebase. probably due to my saving action in the eclipse workspace
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 15:08:12 +02:00
9f801d1f3a
Changing the way the DAOs were being injected in the RuleApplier;
...
Making code clearer and simple.
Conflicts:
server/src/com/cloud/network/rules/PrivateGatewayRules.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java
2014-10-14 15:08:12 +02:00
60eea3bb1a
Adding fixes for the add user data and vpn rules
2014-10-14 15:08:11 +02:00
f2f4732854
Removing the VirtualNetworkStatus, it was not being used properly;
...
fixing the injection of the network DAO in the PrivateGatewayRules;
all tests that were failing in Travis have been tested before the commit.
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 15:08:11 +02:00
dc5fefc018
making sure the instance variable _router in the Rules is being used instead of the parameter
...
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
2014-10-14 15:08:11 +02:00
64eed6c6ab
Fix: VpcRouter has always PublicIp setup as it did before refactoring
2014-10-14 15:08:10 +02:00
ee9068b5b2
merging cmd-visitor into cmd-visitor-rebase, with the upstream from ACS repo
...
Conflicts:
server/src/com/cloud/network/rules/DhcpRules.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
2014-10-14 15:08:10 +02:00
b7c193a88d
fixing nic plug unplug rule
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
2014-10-14 15:08:10 +02:00
5f51a06e3c
fix dhcp subnet rules. we can create VMs again.
2014-10-14 15:08:10 +02:00
02c75251b3
Fixing NPE due to use of dependencies before Spring injection
2014-10-14 15:08:09 +02:00
cd8cadaf9c
Refactor hypervisor retrieval from VpcNwHelper and NwHelper
...
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
2014-10-14 15:08:09 +02:00
65fb21647a
auto wire the network helper
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:08:09 +02:00
546e563c27
refactor all private methods in the virtual router appliance and VPC appliance
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/com/cloud/network/rules/LoadBalancingRules.java
server/src/com/cloud/network/rules/RuleApplier.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/AdvancedNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
2014-10-14 15:08:09 +02:00
b5e96af4e2
Missing license headers
2014-10-14 15:02:14 +02:00
2802d3b75b
Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers
2014-10-14 15:02:14 +02:00
e08cb11fc0
fixing check style issues
...
Conflicts:
server/src/com/cloud/network/element/VpcVirtualRouterElement.java
server/src/com/cloud/network/rules/AdvancedVpnRules.java
server/src/com/cloud/network/rules/RuleApplier.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/AdvancedNetworkVisitor.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/NetworkTopology.java
2014-10-14 15:02:14 +02:00
01edc8e394
adding setupPrivateGateway to new style;
...
removing methods from Vpc appliance;
changing the way VpcElement calls the command;
there is still work tob e done with the destroyPrivateGateway rule.
Conflicts:
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
2014-10-14 15:02:13 +02:00
b9bff843c6
Whole router.deployment package got 97% coverage
...
Conflicts:
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
2014-10-14 15:02:13 +02:00
3d4ddb7251
DeployRouter includes nw creation following TellDontAsk principle
...
Also factor out NicProfile specific methods and fix some DI config.
Conflicts:
server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
2014-10-14 15:02:13 +02:00
adebaf2bd0
adding applyStaticRoutes to the new visitor pattern.
2014-10-14 15:02:13 +02:00
b96035f356
adding applyStaticRoutes method to the network topology/visitor. it will be used by the VPC virtual net manager appliance.
...
Conflicts:
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
2014-10-14 15:02:12 +02:00
Nitin Mehta
Daan Hoogland
Sanjay Tripathi
Santhosh Edukulla
Jayapal
Damodar
Bharat Kumar
Mike Tutkowski
wilderrodrigues
Antonio Fornie