CLOUDSTACK-3655: RvR fails with unexpected state

The guestcidr is no longer specified directly. Use the netmask and
gateway combination to create custom cidr network

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit a4d902fc9b48e963d5987965207e3745e1728741)
CLOUDSTACK-3655: RvR tests fail when handling switchover

During switchover of master->backup->master, the rvr goes through
UNKNOWN, FAULT, MASTER/BACKUP. In case of improper transition the state
is FAULT. Include additional state check in the tests.
(cherry picked from commit 0c699394f246bc2b052a22d88b3f938ba8a72770)
CLOUDSTACK-3452: Created security group for basic mode to allow SSH to vm

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 9c24c471bca83241a9ebf586567c0fd61231da19)
CLOUDSTACK-3644: Failed to pass apiclient to public ip delete

Test VPC Release IP assigned to LB rule fails because we don't pass in
the apiclient to it.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 2f0a0a61363074ffa959d7ff9596a1b07b2de40a)
CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events
for portable IPs

generating usage events for acquire/release of portable IP
CLOUDSTACK-3640: [Usage][GSLB] usage events are not generated for GSLB

geneating usage events for create/delete of GSLB rule
CLOUDSTACK-3628: [Storage]Migration of data disk from Shared primary to shared/local primary storage is throwing NPE
'Long' value was getting passed to a parameter of type 'long' and in case of null was resulting in NPE
CLOUDSTACK-2053: Fixed userdata.sh redundancy and cloud-init support
Applied review request 12685
Summary: devcloud-kvm marvin zone config fix for 4.2, add provider to img store

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1374264479 -0600
InternalLb: fixed creation for default network offering with internal lb support - public lb support should be disbaled on it
CLOUDSTACK-732 Add disk snapshot for KVM 6.3, add the flag in CS.

Signed-off-by: Edison Su <sudison@gmail.com>

Conflicts:

	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
CLOUDSTACK-3651: Infrastructure menu - zone detail - listVmwareDcs API only exists in non-oss build, suppress error "The given command does not exist or it is not avaiable for user" from UI for this specific case.
CLOUDSTACK-3453
UCS:API: List Blades after decommissioning a blade, listUcsBlades API returns wrong number of total blades

fixed resolved
System Template shows twice in listTemplates with S3 as secondary
storage.
CLOUDSTACK-3428
UCS:API: We need listUCSManager API to lists all UCS managers registered with CloudStack

fix entityType in api command
CLOUDSTACK-3643: Fix wrong protocol type and test case sequence
CLOUDSTACK-3620: [Automation] API removevpnuser failed, in test case test_project_usage.TestVpnUsage.test_01_vpn_usage.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK:3452: Check if security groups feature is enabled in basic zone before creating security group while creating VM

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3c360ce02807240586d471ab4c0cbd24d76ed7e6)
CLOUDSTACK-3452: Refactor VirtualMachine.create()

When creating a VM if it's going to a basic zone program sec.group rules
so as to allow SSH access for any tests requiring ssh access to the
guest. Similarly method used to program the NAT and PF for SSH access is
refactored and extracted into a separate method. By default no SSH
access is allowed if the mode is set to 'default'

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 9c9003a0dba755135f643777083b80ec5fa3d910)