7c20b120c2
Fixing poms and other xmls
2013-03-12 23:31:46 +05:30
ee868759a8
Merge branch 'master' into cisco-vnmc-api-integration
...
Conflicts:
api/src/com/cloud/network/Network.java
api/src/org/apache/cloudstack/api/ApiConstants.java
plugins/pom.xml
setup/db/create-schema.sql
2013-03-12 14:44:59 +05:30
9c94b6d231
Fixed XML to create static route in VNMC correctly
2013-03-08 22:20:23 +05:30
ef069b3323
Added logic for revoking ACL, PF and Static NAT rules
2013-03-08 15:26:26 +05:30
4c65b70668
Renamed delete-acl-rule -> delete-rule
2013-03-08 13:51:37 +05:30
aa94eca516
- Creating static routes in VNMC as part of edge firewall configuration
...
- Passing order parameter while creating rules so that they are evaluated in a specific order
- Added methods in VnmcResource for listing acl policies and rules belonging to variouos policies. This is used to compute order while creation of various rules in VNMC
2013-03-08 00:38:52 +05:30
cc824e8585
Adding appropriate ACL rules for PF and static NAT
2013-03-07 12:16:29 +05:30
fb23c50365
Added logic for deleting various VNMC artifacts. Added/updated relevant xmls as well.
2013-03-01 17:21:45 +05:30
970c21a9a3
Added implementation for delete of asa and vnmc apis
2013-03-01 01:54:10 +05:30
22e1455142
List asa api to return guest network if associated. From this it can be inferred if asa is available or not
2013-03-01 01:19:43 +05:30
32223736c9
Added Vmware cluster info along with asa1kv appliance.
...
This is used to select the correct n1kv vsm for configuring the guest network
2013-03-01 00:50:55 +05:30
1b408509d6
CLOUDSTACK-1332: Add IPv6 DNS for Zone
2013-02-25 16:08:10 -08:00
cd291f6b4b
From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001
...
From: Vijayendra <vijayendra.bhamidipati@citrix.com>
Date: Mon, 25 Feb 2013 14:37:27 -0800
Subject: [PATCH] CS-670: Configurable setting to use linked clones or not on
VMware
Description:
Providing support for creation of user VMs as full clones on ESX.
Putting in unit tests for VO and Dao classes introduced in this commit.
Signed-off-by: Vijayendra <vijayendra.bhamidipati@citrix.com>
---
core/src/com/cloud/vm/UserVmCloneSettingVO.java | 50 ++++++
.../hypervisor/vmware/manager/VmwareManager.java | 3 +
.../vmware/manager/VmwareManagerImpl.java | 18 +-
.../hypervisor/vmware/resource/VmwareResource.java | 117 +++++++++----
server/conf/migration-components.xml | 1 +
server/src/com/cloud/configuration/Config.java | 1 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 184 ++++++++++-----------
.../com/cloud/vm/dao/UserVmCloneSettingDao.java | 37 +++++
.../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 74 +++++++++
.../vm/dao/UserVmCloneSettingDaoImplTest.java | 62 +++++++
.../UserVmCloneSettingDaoTestConfiguration.java | 52 ++++++
.../test/resources/CloneSettingDaoTestContext.xml | 42 +++++
setup/db/db/schema-410to420.sql | 9 +
13 files changed, 527 insertions(+), 123 deletions(-)
create mode 100755 core/src/com/cloud/vm/UserVmCloneSettingVO.java
create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDao.java
create mode 100755 server/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java
create mode 100644 server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java
create mode 100644 server/test/resources/CloneSettingDaoTestContext.xml
2013-02-25 14:57:57 -08:00
deed3cc951
Added support for static NAT rules.
...
- Xmls for creating static nat rules in VNMC
- applyStaticNats implementation in VNMC network element
- handler for static nat in resource class
2013-02-25 18:03:59 +05:30
681f0b7b50
Added implementation for firewall and port forwarding rules in Cisco VNMC element class
2013-02-25 10:44:13 +05:30
667aa17512
CLOUDSTACK 711: CPU and RAM overcommit update cluster part
2013-02-22 20:09:50 +05:30
66b01a6589
VNMC xml for deleting NAT policy
2013-02-22 19:19:44 +05:30
5d98686768
Added support for PF/DNAT rules.
...
Created methods in VNMCConnection class to create PF rules. Also moved out common code for PF and source NAT in methods.
Updated the corresponding VNMC resource class.
2013-02-22 19:16:41 +05:30
8db2fbeb8f
Added xml for creating NAT policy set in VNMC
2013-02-22 18:21:45 +05:30
f2da0d50ca
Added VNMC XMLs for supporting PF/DNAT rules.
...
Also moved out some XMLs related to source NAT to common files so that these can be used for both source NAT and DNAT
2013-02-22 18:17:53 +05:30
23e54bb0f4
Cloudstack-711: Cpu and Ram Overcommit Ratio.
2013-02-22 17:31:06 +05:30
dae57c1ab2
add missing license header reported by rat
2013-02-22 13:22:14 +08:00
3bb713c5ce
fix adding nfs primary storage and build and load
2013-02-21 16:24:39 -08:00
8855d793ee
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
pass host id to baremetal discover when mgmt loads existing hosts
2013-02-21 15:48:20 -08:00
15ead099a1
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
able to start vm
Conflicts:
client/tomcatconf/componentContext.xml.in
server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-21 15:48:08 -08:00
55b77c7c8f
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
adding missing scripts back
Conflicts:
client/pom.xml
client/tomcatconf/commands.properties.in
server/src/com/cloud/server/ManagementServerImpl.java
2013-02-21 15:46:11 -08:00
1f15c1e9e7
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
fixing bugs to align to new code base
Conflicts:
client/tomcatconf/componentContext.xml.in
2013-02-21 15:42:38 -08:00
54741a2b0f
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
add api annotation to baremetal related api
2013-02-21 15:41:21 -08:00
ff047e75d3
refactor snapshot, move existing snapshot code into its own snapshotstrategy
2013-02-21 11:22:49 -08:00
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
368a5d5a9a
Prachi's commit 20a747601c introduced a
...
new call to network.getPhysicalNetworkId() which wasn't mocked yet in
the nvp plugin unittests.(cherry picked from commit aea5b268b4
2013-02-21 14:08:56 +01:00
124a48819d
Separated out creation of ACL policy set and policy in VNMC
2013-02-21 17:53:12 +05:30
1e38515f35
Added changes to create ingress fw rules in VNMC
2013-02-21 11:54:44 +05:30
f7b600b439
CLOUDSTACK-1334 global config vmware.root.disk.controller doesn't work
2013-02-21 11:29:08 +08:00
ec1f48a4b2
CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan
...
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
2013-02-20 11:23:32 -08:00
80d58b6c73
CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
edac894f31
spring changes for simulator component
...
allow spring to do DI for simulator plugin. componentContext.xml will
have simulator components disabled by default.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-19 16:40:57 +05:30
f2b97db0f9
CLOUDSTACK-1172: LDAP enhancements
2013-02-19 15:36:39 +05:30
c94a75c0a6
CLOUDSTACK-752: Removed 1 private gateway for VPC limitation.
...
Verified that more than 8 private gateways can be created.
2013-02-19 14:15:02 +05:30
cc2a3c5498
CLOUDSTACK-651: Removed 7 nics limitation for VR on XenServer
...
# of nics can be configured using global param xen.nics.max. Param defaults to 7
Added new param to upgrade schema.
2013-02-18 20:30:03 +05:30
5147fb16ac
CLOUDSTACK-1253: Remove @author tag.
2013-02-15 10:42:06 -08:00
bc493bd39b
CLOUDSTACK-672: Set VMware cluster max. limit based on HV version
...
Max. number of hosts in a Vmware clueter is specific to the version of the HV. This limit is read from the hypervisor_capabilities table
2013-02-15 16:19:40 +05:30
298c5ee06b
Summary: Adjust systemvm.iso path for KVM, due to packaging changes
...
Detail: Removing references to /usr/lib/cloud and /usr/lib64/cloud so that old
systemvm.iso files aren't found by accident. systemvm.iso should exist in
/usr/share/cloudstack-common/vms now.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360860243 -0700
2013-02-14 09:45:57 -07:00
cb2fba9e7c
Source NAT in VNMC
2013-02-14 16:23:05 +05:30
35cf56862f
Summary: KVM - Fix physical net parsing when traffic label points to tagged dev
...
Detail: If your traffic label points to a bridge that is on a tagged interface
rather than a real physical interface, cloudstack may not parse the physical
interface correctly, bringing up tagged interfaces on the tagged interface.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360798665 -0700
2013-02-13 16:45:18 -07:00
f542c320d3
Removed a bunch of missing files and useless imports
2013-02-13 15:41:27 -08:00
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
3a0c99b0a4
CLOUDSTACK-710: CitrixResourceBase, if dest dir is not found, mkdir -m 700 -p
...
This is a security failsafe, so even if destination does not exist we mkdir the path
with 0700 permission. If path exists mkdir -m 700 -p won't do anything.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 22:45:32 +05:30
fcb4b7a6a7
CLOUDSTACK-1237: Fix an overriding method that would help find template adapter
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 15:19:30 +05:30
720fe2f908
Fix Vnmc test file
2013-02-13 14:16:47 +05:30
Koushik Das
Sheng Yang
frank
Bharat Kumar
Mice Xia
Edison Su
Edison Su
Hugo Trippaers
hongtu_zang
Prachi Damle
Rohit Yadav
Prasanna Santhanam
Abhinandan Prateek
Kishan Kavala
Min Chen
Marcus Sorensen
Alex Huang