07ba078ee6
CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning
2014-11-03 11:19:06 -08:00
684889f0b5
CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning
2014-11-03 10:52:47 -08:00
e427d0004c
CLOUDSTACK-7267: For LXC volumes, show unsupported operation error for template creation from ROOT volume
2014-11-03 17:20:21 +05:30
99010f463b
CLOUDSTACK-7265: For LXC volumes, show unsupported operation error for volume snapshot
2014-11-03 17:20:00 +05:30
d6fdb7c6bc
CLOUDSTACK-7253: For LXC Vms, show unsupported error for console access
2014-11-03 17:19:15 +05:30
1aef5cba66
Fixed Coverity Issues
2014-11-03 16:45:30 +05:30
1c01da3e08
CLOUDSTACK-7828.Avoid marking IPs already in Allocated as Allocated again. Use row lock to ensure that prev state is either Allocating or Free. This will inturn avoid logging duplicate events
2014-11-03 12:40:13 +05:30
efc9632c1b
CLOUDSTACK:6915 search including removed
2014-10-31 15:47:18 -07:00
6df396c9c0
Merge branch '4.5' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.5
2014-10-31 15:29:40 -07:00
0c153966e6
CLOUDSTACK:6915 search including removed
2014-10-31 15:29:07 -07:00
138366804d
CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event.
2014-10-31 15:25:06 -07:00
2652195010
CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event.
2014-10-31 15:24:32 -07:00
f543d86eff
saml: Use camelCase api names for SAML login/logout apis
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 01:24:39 +05:30
cd52bed477
saml: Use camelCase api names for SAML login/logout apis
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 85c0bd68ae8a76c231ab402dd0311e3672155f71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 00:32:29 +05:30
62f9bf0fff
PR #26 CLOUDSTACK-7688, CLOUDSTACK-7747
...
Restricted various operations for VM with VM Snapshots #26
This closes #26
2014-10-30 15:11:57 +05:30
d8b46b81b9
CLOUDSTACK-7767: fixed events are not generated for snapshot creation
2014-10-30 13:25:06 +05:30
a4d8215ebb
CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots.
...
Now they are informed that they cannot perform the operation.
To perform operation they have to remove VM snapshots of VM.
2014-10-30 12:37:50 +05:30
c78f14cbc2
fixed NPE
2014-10-29 17:05:42 -07:00
b6d8ceda3d
there is no transaction context during the mgt server start, thus causing transaction.close will delete op_lock table if aquireinlocktable is called Reviewed-by: Anthony and Min
2014-10-30 02:21:29 -07:00
055901acda
CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to
...
complete, slow compared to previous 4.3 release.
2014-10-27 17:00:42 -07:00
dd7026b20e
CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone
...
In basic network, the correct network id associate with IP is source network id
rather than network id.
2014-10-27 16:49:30 -07:00
307a35a618
CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone
...
In basic network, the correct network id associate with IP is source network id
rather than network id.
2014-10-27 16:46:01 -07:00
4f43839dae
CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to
...
complete, slow compared to previous 4.3 release.
2014-10-27 16:27:17 -07:00
db6a0d65aa
No need to log discrepancy resource count message for Primary and secondary storage.
2014-10-27 15:26:06 +05:30
4f4595cef8
No need to log discrepancy resource count message for Primary and secondary storage.
2014-10-27 15:23:36 +05:30
c5fa7cc494
Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.
...
"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU.
2014-10-27 13:59:59 +05:30
9bcf0e1bf6
Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.
...
"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU.
2014-10-27 13:52:28 +05:30
32dc09f2c3
even xenserverinvestigator returns true, that means host is up, but XAPI may not work
2014-10-23 16:10:18 -07:00
10cc7f86af
CS-21296: hidden snapshot.backup.rightafter, as it's not needed
2014-10-22 15:36:35 -07:00
4a13f81485
when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA.
2014-10-22 15:14:46 -07:00
c52e14730e
when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA.
2014-10-22 15:07:40 -07:00
ee0f0a1cff
CLOUDSTACK-7771: Throw exception while restoring vm if the template is already deleted. Also fix the usage event being generated from the right template id and fix the log message which sometime showed incorrect template id.
...
CLOUDSTACK-4201: listServiceOfferings API needs to be able to take virtualmachineid of SystemVM and return service offerings available for the vm to change service offering
2014-10-22 15:03:25 -07:00
97aa02ceb0
Commits related to taking snapshots that live on primary storage
2014-10-22 12:44:33 -06:00
0141b37784
CLOUDSTACK-7761:
...
Revert "when system VM ping times out, stop system VM"
This reverts commit ee23be1942
2014-10-21 17:21:17 -07:00
70112bd145
CLOUDSTACK-7761:
...
Revert "when system VM ping times out, stop system VM"
This reverts commit ee23be1942
2014-10-21 17:19:57 -07:00
57dacf99a2
Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)"
...
Changed "void disconnectVolumeFromHost(VolumeInfo, Host, DataStore)" to "void revokeAccess(DataObject, Host, DataStore)"
2014-10-21 16:01:14 -06:00
06f6b00cd1
Snapshot support
2014-10-21 16:01:13 -06:00
e1a993d37b
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. Also bring the logic of setting source template id to create() method than execute which was wrongly put in.
2014-10-21 09:57:02 -07:00
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
287ff83552
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.
2014-10-20 16:49:48 -07: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
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
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
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
2da3ceda31
Refactor to include network creation as actual deployment
...
Conflicts:
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
2014-10-14 15:02:12 +02:00
00dc8a7b24
fixing check styles
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:02:12 +02:00
16ad4122b4
moving sendCommand to the NetworkGeneralHelper;
...
adding handle single network method to the NetworkGeneralHelper;
moving getRealPriority to the NetworkGeneralHelper;
making priority constants part of the VirtualNetworkApplianceManager;
changing the network topology implementation in order to use the NetworkGeneralManager instead of the appliance
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:02:11 +02:00
d2d9157ab0
Complete tests for normal deployment and start vpc one
...
Conflicts:
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
2014-10-14 15:01:16 +02:00
12b0d188cb
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-14 15:01:16 +02:00
6fac12675d
More refactoring and testing in the same classes
...
Conflicts:
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
2014-10-14 15:01:15 +02:00
325026de3f
fixing VPC IP Association and ACL rules. Have to rewrite in a better why the apply rules method in the Advanced Topology
2014-10-14 15:01:14 +02:00
b97f2b05c7
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-14 15:01:14 +02:00
f23ba91ed1
Fixing null pointers during vpc router deployment
2014-10-14 15:01:13 +02:00
bfd4316b58
adding new bean to spring context file; renaming package from "com" to "org"
2014-10-14 15:01:13 +02:00
0b78731bc7
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-14 15:01:12 +02:00
95395f9574
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-14 15:01:12 +02:00
e99b5b0760
fixing the injection of the networkDao
...
Conflicts:
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
2014-10-14 15:00:33 +02:00
8f313ca5d3
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-14 15:00:32 +02:00
b9ffe2329e
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-14 15:00:32 +02:00
Min Chen
Kishan Kavala
Santhosh Edukulla
amoghvk
Nitin Mehta
Rohit Yadav
Anshul Gangwar
Anthony Xu
Edison Su
Sheng Yang
Sanjay Tripathi
Mike Tutkowski
Daan Hoogland
Jayapal
Damodar
Bharat Kumar
wilderrodrigues
Antonio Fornie