Merge 4.5 to master#36

Closed

karuturi wants to merge 468 commits intoapache:masterfrom

karuturi:merge-4.5-to-master

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 13, 2014

change dos line ending to unix format
kishankavala
committed
CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events

Damodar
authored and
kishankavala
committed
CLOUDSTACK-7313 Fixed issues in provisioning vpx in SDX from CS
rajesh-battala
committed
Fixed Resource Leaks
sedukull
committed
CLOUDSTACK-7469 Complete simulator build support

alexbrett
authored and
Frank Zhang
committed
fixed NPE on calculating vm snasphot volume size
Anthony Xu
committed
change vlan_id in vlan table to format "vlan://"
Anthony Xu
committed
Don't do chmod -R when mounting secondary storage for vmware
Frank Zhang
committed
CLOUDSTACK-7700: Volume Snapshot Async Job returns Success for a failed
minchen07
committed

Commits on Oct 14, 2014

Fixed few coverity issues
sedukull
committed
CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
sanjaytripathi
committed
Rules and visitors for Load Balance Rules

Antonio Fornie
authored and
wilderrodrigues
committed
Extract general behavior to Router and Vpc delegates

Antonio Fornie
authored and
wilderrodrigues
committed
Fix dependency problem. Extract and unify router deployment stuff

Antonio Fornie
authored and
wilderrodrigues
committed
Adding Firewall Rules to comply with the Visitor pattern implementation; refactoring the applyRules so we can reuse it.

Wilder Rodrigues
authored and
wilderrodrigues
committed
changing accessor modifier in instance variables

Wilder Rodrigues
authored and
wilderrodrigues
committed
fixing checkstyles
wilderrodrigues
committed
finished firewall rules and load balancing rules; fixed all the injection problems; added VirtualMachineManager to the appliance factory to be injected.
wilderrodrigues
committed
TODO

DaanHoogland
authored and
wilderrodrigues
committed
adding static nat rules. Deploying new VMs is not working due to the appliance refactory, will check the changes with Antonio tomorrow.
wilderrodrigues
committed
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.
wilderrodrigues
committed
adding apache license headers
wilderrodrigues
committed
adding Ip Association and VPN Rules
wilderrodrigues
committed
Fix offering setup

Antonio Fornie
authored and
wilderrodrigues
committed
package rename

DaanHoogland
authored and
wilderrodrigues
committed
Temporary put state info in a state object

Antonio Fornie
authored and
wilderrodrigues
committed
fixing the classes relationship; adding beans properly in the spring context; using the right basic/advance stuff; testing ip and port forwarding rules
wilderrodrigues
committed
adding password to router rules; moving the advance code to the advance net topology.
wilderrodrigues
committed
Unify and encapsulate deployment flow methods and params

Antonio Fornie
authored and
wilderrodrigues
committed
adding userdata to router and ssh pub key to router rules.
wilderrodrigues
committed
making instance variables compliant with ACS convention
wilderrodrigues
committed
adding user data pwd rules
wilderrodrigues
committed
fixing injection of beans with a relationship
wilderrodrigues
committed
whitespace

DaanHoogland
authored and
wilderrodrigues
committed
fixing the injection of the networkDao
wilderrodrigues
committed
Deployment more OO - Objects with data and behavior

Antonio Fornie
authored and
wilderrodrigues
committed
replacing my IP by localhost to avoid problems with my environment
wilderrodrigues
committed
fixing import in virtual router element and checkstyle in dhcp entry related changes
wilderrodrigues
committed
commenting broken code in tests in order to run build adn tests other changes via the UI
wilderrodrigues
committed
removing bean from the xml
wilderrodrigues
committed
adding new bean to spring context file; renaming package from "com" to "org"
wilderrodrigues
committed
Fixing null pointers during vpc router deployment

Antonio Fornie
authored and
wilderrodrigues
committed
apply network acls; acls items to pvt gw; vpc ip association
wilderrodrigues
committed
fixing VPC IP Association and ACL rules. Have to rewrite in a better why the apply rules method in the Advanced Topology
wilderrodrigues
committed
Splitting Vpc and NonVpc deployment into phases & testing it

Antonio Fornie
authored and
wilderrodrigues
committed
RouterDeployment and VPC. Improving code and Unit Testing

Antonio Fornie
authored and
wilderrodrigues
committed
More refactoring and testing in the same classes

Antonio Fornie
authored and
wilderrodrigues
committed
License headers

Antonio Fornie
authored and
wilderrodrigues
committed
Replacing the old [Vpc}VirtualNetworkApplianceManager by the new ones;
wilderrodrigues
committed
Complete tests for normal deployment and start vpc one

Antonio Fornie
authored and
wilderrodrigues
committed
Factor out prepareDeployment and update tests

Antonio Fornie
authored and
wilderrodrigues
committed
Increasing test coverage for Vpc Deployment

Antonio Fornie
authored and
wilderrodrigues
committed
Fix unnecessary changes Spring contexts

Antonio Fornie
authored and
wilderrodrigues
committed
moving sendCommand to the NetworkGeneralHelper;
wilderrodrigues
committed
fixing check styles
wilderrodrigues
committed
Refactor to include network creation as actual deployment

Antonio Fornie
authored and
wilderrodrigues
committed
adding applyStaticRoutes method to the network topology/visitor. it will be used by the VPC virtual net manager appliance.
wilderrodrigues
committed
adding applyStaticRoutes to the new visitor pattern.
wilderrodrigues
committed
DeployRouter includes nw creation following TellDontAsk principle

Antonio Fornie
authored and
wilderrodrigues
committed
Whole router.deployment package got 97% coverage

Antonio Fornie
authored and
wilderrodrigues
committed
adding setupPrivateGateway to new style;
wilderrodrigues
committed
fixing check style issues
wilderrodrigues
committed
Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers

Antonio Fornie
authored and
wilderrodrigues
committed
Missing license headers

Antonio Fornie
authored and
wilderrodrigues
committed
refactor all private methods in the virtual router appliance and VPC appliance
wilderrodrigues
committed
auto wire the network helper
wilderrodrigues
committed
Refactor hypervisor retrieval from VpcNwHelper and NwHelper

Antonio Fornie
authored and
wilderrodrigues
committed
Fixing NPE due to use of dependencies before Spring injection

Antonio Fornie
authored and
wilderrodrigues
committed
fix dhcp subnet rules. we can create VMs again.
wilderrodrigues
committed
fixing nic plug unplug rule
wilderrodrigues
committed
merging cmd-visitor into cmd-visitor-rebase, with the upstream from ACS repo
wilderrodrigues
committed
Fix: VpcRouter has always PublicIp setup as it did before refactoring

Antonio Fornie
authored and
wilderrodrigues
committed
making sure the instance variable _router in the Rules is being used instead of the parameter
wilderrodrigues
committed
removing the root password becuase it was breaking the simulator tests. Root password must always be empty
wilderrodrigues
committed
Removing the VirtualNetworkStatus, it was not being used properly;
wilderrodrigues
committed
Adding fixes for the add user data and vpn rules
wilderrodrigues
committed
Changing the way the DAOs were being injected in the RuleApplier;
wilderrodrigues
committed
fixing checkstyle in the virtual network manager. problem appeared after a rebase. probably due to my saving action in the eclipse workspace
wilderrodrigues
committed
Fixing the NetworkHelperImpl class. It was throwing a NPE due to a hypervisor type SIMULATOR not being in the hashmap.
wilderrodrigues
committed
CLOUDSTACK-6278 Baremetal Advanced Networking support from commit id e06fa18ed2ee2ee6a417e089cf5ac6bde11d0079 by Frank Zhang
wilderrodrigues
committed
Applying the latest chances from the VPC Refactor branch onto the new one.
wilderrodrigues
committed
Applygin fix from commit ID aaeadc5c44e3fe16a1deea5348b085b08b5f4f4d
wilderrodrigues
committed
Applying fix from commit id 6b8e0baa21e6cffc62eb2d35eecc7aeb2087d1c1
wilderrodrigues
committed
Fixing checkstyle.
wilderrodrigues
committed
Merge branch 'vpc-refactor-clean-for-PR' of https://github.com/schubergphilis/cloudstack
DaanHoogland
committed
CLOUDSTACK-7563: Fix potential NPE from FingBugs.
minchen07
committed
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 seconda…
Mike Tutkowski
committed
CLOUDSTACK-7723: UI > Storage > detail view > add Disk Offering field.
Jessica Wang
committed

Commits on Oct 15, 2014

Implementing snapshot-strategy support for reverting a volume to a snapshot
Mike Tutkowski
committed
vGPU VMSnapshot Test Automation
sailajamada
committed
CLOUDSTACK-7693: Fixing pep8 issues

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7690: Added missing unittest import to test_escalations_volumes.py

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
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
nitinmeh
committed

Commits on Oct 16, 2014

Commits on Oct 20, 2014

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.
nitinmeh
committed

Commits on Oct 21, 2014

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…
nitinmeh
committed
fix kvm issue, for windows sever 2008, it will crash without hyperv enlightment featre enabled
sudison
committed
There are few cases that mgt server won't reponse agent's pingcommand timely, or in KVM's case, libvirt won't repsonse in few mintues, which will cause agent reconnect to mgt server, then all the o…
sudison
committed
remove unused XS plugins
Anthony Xu
committed
don't need to check if pv driver is updated, old pv driver should work
Anthony Xu
committed
Snapshot support
Mike Tutkowski
committed
Logic on SolidFire side for CloudStack snapshots
Mike Tutkowski
committed
Support for back-end snapshots on primary storage
Mike Tutkowski
committed
Logic around granting and revoking access to the volume that backs the snapshot
Mike Tutkowski
committed
Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)"
Mike Tutkowski
committed
Invoke grantAccess and revokeAccess one time each using a SnapshotInfo (where previously a VolumeInfo was being passed in)
Mike Tutkowski
committed
Improve error handling for a host-side error
Mike Tutkowski
committed
Pass on new command
Mike Tutkowski
committed
Save off the UUID of the VDI before detaching its SR
Mike Tutkowski
committed
Reply that reverting is not supported
Mike Tutkowski
committed
Reorganized the snapshot logic a bit
Mike Tutkowski
committed
fix expried certificate in unit test
Frank Zhang
committed

Commits on Oct 22, 2014

CLOUDSTACK-7761:
Anthony Xu
committed
CLOUDSTACK-7762 -[Automation] - Fix test failure for test_02_revert_vm_snapshots in smoke/test_vm_snapshots.py
Sangeetha Hariharan
committed
Commits related to taking snapshots that live on primary storage
Mike Tutkowski
committed
when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA.
Anthony Xu
committed
CS-21296: hidden snapshot.backup.rightafter, as it's not needed
sudison
committed
CLOUDSTACK-7769 - Fixed test_ssvm.py script

pckreddy
authored and
Sangeetha Hariharan
committed
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 sh…
nitinmeh
committed

Commits on Oct 23, 2014

Commits on Oct 24, 2014

CLOUDSTACK-7780: UI > storage > volume > detail view > data provider > remove unnecessary module check.
Jessica Wang
committed

Commits on Oct 27, 2014

Commits on Oct 28, 2014

Commits on Oct 29, 2014

Commits on Oct 30, 2014

Commits on Oct 31, 2014

Commits on Nov 3, 2014

Commits on Nov 4, 2014

CLOUDSTACK-7834
Frank Zhang
committed
CLOUDSTACK-7632:Automation for volume life cycle testPath

Prashant Kumar Mishra
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7728: Test script to identify product issue

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7692: Fixed template register issue in test_project_usage.py

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7691: Fixed 'Exception not raised' issue in test_project_limits.py

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7684: Fixed Exception not raised issue in secondary storage limits test suite test_ss_max_limits.py

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7682: Fixed usage event issue. Used api client of account for which we are checking the usage

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7802: test_vpc_network.py - Increasing polling period for network state check

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7801: test_volumes.py - Fixed import and pep8 issues

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7685: Fixed copy template method call in test_escalations_template.py. Removed unbound method of the same name as bound method from base library and changed method call accordingly

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7805: test_vpc_vms_deployment.py - Removing invalid steps from test case

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
Revert "CLOUDSTACK-7408: Fixed - Private key of the ssh keypair was getting corrupted"

Gaurrav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-7800: VMware - Hot plug/unplug NIC to/from VM only when vmware tools are installed, else assert for exception

Gaurav Aradhye
authored and
SrikanteswaraRao Talluri
committed
CVE20143566: Avoid using SSLv3 on apache2 webserver used by SSVM
yadvr
committed
CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs
sanjaytripathi
committed
CLOUDSTACK-7835: Deleted volumes with null UUID and no removed timestamp in database still appear.
sanjaytripathi
committed
CLOUDSTACK-7421
koushik-das
committed
CLOUDSTACK-7384: UI > Instances > detailView > change service offering option > hide it when VM state is Running and hyperviror is LXC.
Jessica Wang
committed
CLOUDSTACK-7720: No IP Address Validation for Acquire new secondary IP

GaborApatiNagy
authored and
bfederle
committed
CLOUDSTACK-7838: UI - Update category names on Resources tab of a Zone -Changed wording: "Storage" -> "Primary Storage Used", "CPU" -> "CPU allocated", Memory -> "Memory Allocated"

GaborApatiNagy
authored and
bfederle
committed
CLOUDSTACK-7840: UI control tip for 'Add Primary Storage' -> 'Provider' seems wrong

GaborApatiNagy
authored and
bfederle
committed
Fixes: [UI] Added missing label to properties.file.

vetrivelc
authored and
bfederle
committed
CLOUDSTACK-7645

Mihaela Stoica
authored and
bfederle
committed
CLOUDSTACK-7383: UI > Instances > detailView > snapshot option > hide this option when hypervisor is LXC.
Jessica Wang
committed

Commits on Nov 5, 2014

CLOUDSTACK-7841: Gracefully reload haproxy config
Sheng Yang
committed
Merge branch '4.5'
karuturi
committed
Merge branch '4.5'
karuturi
committed