Commit Graph

2895 Commits

Author SHA1 Message Date
Edison Su 059f605ace add more interfaces 2012-10-22 17:50:51 -07:00
Hugo Trippaers 6a20802640 Fix runtime dependencies for vmware modules
The vmware modules should be listed as provided so they are never
packaged. However this also means that you have to put them in the
web-inf/lib directory by hand.

Set the version of the api in the central pom for easy reference.

Add wsdl4j as a runtime requirement. It is actually required by the
vmware implementation but it is easier to list it as a requirements for
the component here as vmware is not in any maven repo

put the dependency on vim back in the dependencies. It is not required
for compile, but is required as runtime by apputils.
2012-10-22 17:58:36 +02:00
Hugo Trippaers 53cea844bc The interface change introduced by commit
214bbf3ebd broke the nonoss build.
2012-10-18 09:40:13 +02:00
Hugo Trippaers 3bb136292b Double check vmware dependencies and provide information on where to get
them.
2012-10-15 16:57:59 +02:00
Rohit Yadav 9b1b145192 CLOUDSTACK-346: Replace vmware-lib-jaxrpc with axis-jaxrpc
vmware-lib-jaxrpc is now provided by axis-jaxrpc-1.4.jar, the former is
the same as latter (bit by bit) and only difference is the file name.

- Fix dependency in vmware-base's pom.xml
- Fix dependency in hypervisor-plugin-vmware's pom.xml
- Fix install-non-oss.sh by reverting commit:
    2e6ddc6c36.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-15 16:44:30 +05:30
Kelven Yang 5fee891162 merge from master 2012-10-11 17:42:25 -07:00
Edison Su ac97d67528 add nonoss maven build 2012-10-11 01:15:52 -07:00
Wido den Hollander f4a2298ca9 rbd: Make secret usage names unique for all pools
Since only the cephx user like 'admin' was passed we couldn't define two RBD storage pools
using the cephx user admin, even if they were running on different Ceph clusters.

By adding the monitor hostname and poolname to the secret's usage (which we don't even use) it becomes
unique.
2012-10-10 00:21:14 +02:00
Alex Huang 9d94e6b1d3 Changed the hardcoded vmware path to point to cloud/common 2012-10-06 23:43:44 -07:00
Marcus Sorensen 653889dc4d KVM: removes check for 'snapshot' text in qemu-img --help output
Signed-off-by: Edison Su <sudison@gmail.com>
2012-10-05 17:58:12 -07:00
Rohit Yadav 3e7ba774f9 CLOUDSTACK-254: Fix exec path for netusage.sh
Fixes the hard coded path in the vmware plugin.
The systemvm.iso file would copy the script only to /opt/cloud/bin.
Same is the path used for vpc_netusage.sh

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-10-04 15:30:43 +05:30
Edison Su 751d391a32 build kvm-agent.zip 2012-10-02 15:38:34 -07:00
Hugo Trippaers 25dd8de70a Fix dependencies for vmware hypervisor.
Remove unused imports from VmwareResource as they caused a dependency to
xapi.
2012-10-02 14:25:40 -07:00
Hugo Trippaers 46be0537bf Core should not depend on xapi, only the xen and ovm plugin.
Awsapi needs axis2-adb
2012-10-02 10:19:15 -07:00
Hugo Trippaers aa6355ffe6 Updated master to 4.1.0
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT
2012-10-01 11:00:55 -07:00
Anthony Xu 5d301f2af5 CS-16370 , VCP, support delete guest network for vmware 2012-09-26 17:42:42 -07:00
Anthony Xu ba8b418542 CS-16375: do desetup network after last VM in guest network is gone 2012-09-26 17:42:42 -07:00
Marcus Sorensen 915babd970 fix kvm traffic labels (guest traffic types on multiple networks don't
work)

Cloudstack seems to let you create guest traffic types on multiple
physical networks. However, when I try this with KVM I end up always
bridging to whatever device is used for guest.network.device. This pulls
the traffic label (NicTO.getName()) and uses that bridge to ensure that
we get on the correct physical network, rather than just always using
the guest.network.device.

This also changes the bridge naming scheme from cloudVirBr + vlanid to
br + physicalinterface + "-" + vlanid. This is because we should be able
to support the same vlan numbers per physical network, and the previous
bridge name would not support this and collide.

Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-26 17:14:57 -07:00
Edison Su de13b097ae Revert "find local storage based on name label"
This reverts commit a95a9dc07c.
2012-09-26 16:38:50 -07:00
Marcus Sorensen f0e928461a KVM: Storage Pool collisions on ISOs due to using random UUID on pool
create

The code is unable to detect an existing pool, because we use a random
UUID each time. New Libvirt doesn't allow multiple pools to be defined
to the same storage.  This patch generates a UUID based on the storage
path, so that it can be detected as existing and reused. It also cleans
up no-op code and adjusts the naming of a few things to clean up any
confusion.

Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-26 16:19:06 -07:00
Marcus Sorensen 38a885776c fix /root/.ssh directory creation for KVM
Since /root is r-x permissions, Java fails to mkdir /root/.ssh (even
though the agent is running as root) because it looks for the writable
permission. This patch modifies the 'chmod 700 /root/.ssh' shell command
that we already use into 'mkdir -m 700 /root/.ssh', to be able to create
the directory as root even though write permissions are not set on
/root. This seemed cleaner/safer than adding writable to /root.

Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-26 14:03:12 -07:00
Edison Su a95a9dc07c find local storage based on name label 2012-09-26 11:50:23 -07:00
Edison Su 7f914ace65 fix can't find system vm template on latest ubuntu 12.04, for devcloud 2012-09-25 15:49:16 -07:00
Edison Su 66dc718625 add error log, if adding storage pool failed 2012-09-21 17:54:54 -07:00
Kelven Yang 066ff97b01 Commit for https://reviews.apache.org/r/7191/ 2012-09-20 15:46:40 -07:00
Kelven Yang 4c5f41bfeb Commit for https://reviews.apache.org/r/6928/ 2012-09-20 15:42:06 -07:00
Marcus Sorensen 9324e562e5 systemvm.iso not found when KVM launches system vms
Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-20 13:54:41 -07:00
Edison Su 600a45ed39 fix compile error 2012-09-18 19:49:59 -07:00
Hiroaki Kawai a6aebe098e add logging for debugging.
The default value for local.storage.path does not exists by
default in CentOS 6. By default, this results in NullPointerException
silently. Without this log message, administrator can't figure out
the reason at all.

Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-18 18:28:07 -07:00
Alex Huang 387c6fc135 Merge branch 'master' into javelin 2012-09-17 15:31:37 -07:00
Marcus Sorensen 3a74c36eed CLOUDSTACK-120: Add proper OS name to KVMGuestOsMapper for systemvm
Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-17 14:22:01 -07:00
Marcus Sorensen f52d37fb53 Fix potential nullpointer in recent KVM systemvm patchdisk update
Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-14 15:27:23 -07:00
Alex Huang 6eedfdfb79 Master pull 2012-09-14 11:20:45 -07:00
Wido den Hollander fed7938814 xen: Rename JAR file
cloud-xen.jar does not meet the namespace, so rename it to fit in
2012-09-13 23:19:48 +02:00
frank 7f8a1aabbf remove patch for ovm agent due to license incompatible
will keep them in another place
2012-09-13 13:43:33 -07:00
Jie Feng c9aa08350a [DOC] docbook conversion - choosing a deployment architecture 2012-09-13 16:12:06 -04:00
Alex Huang db9cc97ab3 Brought over new changes from master 2012-09-13 11:43:22 -07:00
Manikanta Kattamuri cfc2b85651 Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-09-13 14:18:14 -04:00
Wido den Hollander b892ff6630 Depend on libvirt-java 0.4.9 due to license change
0.4.9 switched from GPL to MIT
2012-09-13 16:29:01 +02:00
Marcus Sorensen 4c3ab1afb6 fix patch disks from reproducing like rabbits
RB: https://reviews.apache.org/r/7040
Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-12 16:48:38 -07:00
Marcus Sorensen 537c29c2fa Permissions fix for agent creating /root/.ssh
/root/.ssh is created with perms '600' if it doesn't already exist. This causes
a problem in that it can't write out id_rsa.cloud:

2012-08-27 16:35:40,227 DEBUG [cloud.agent.Agent] (agentRequest-Handler-4:null)
Processing command: com.cloud.agent.api.ModifySshKeysCommand
2012-08-27 16:35:40,228 DEBUG [kvm.resource.LibvirtComputingResource]
(agentRequest-Handler-4:null) Failed to create file: java.io.IOException:
Permission denied

Doing 'chmod u+x /root/.ssh' fixed the above, so it seems that even though the
agent is running as root it cares about being able to chdir into /root.ssh

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-09-12 15:48:33 -07:00
Sheng Yang fe8a2992a2 Elimiate mystery guestIp in IpAddressTO
Nobody can explain why it's there...

Also fix wrong return result of several empty network element callbacks
2012-09-12 15:42:48 -07:00
Koushik Das d4b357f88f CS16171 : Cannot attach ISO on VMware VM due to Invalid datastore path error
Handled upgrade scenario where data store already exists in vCenter
2012-09-11 17:37:06 -07:00
Anthony Xu 945aea9c55 CS-15542, return success when vif is not there on deipassoc 2012-09-11 17:34:15 -07:00
Anthony Xu 625ecc306b CS-15542: UnPlugNicCommand return success if vif doesn't exist 2012-09-11 17:34:13 -07:00
Koushik Das eb7746c965 CS16171 : Cannot attach ISO on VMware VM due to Invalid datastore path error
Handled upgrade scenario where data store already exists in vCenter
2012-09-10 14:26:25 +05:30
Anthony Xu fbba8c2ef3 CS-15542, return success when vif is not there on deipassoc 2012-09-07 17:29:49 -07:00
Anthony Xu 9214fa0af6 CS-15542: UnPlugNicCommand return success if vif doesn't exist 2012-09-07 17:21:52 -07:00
Alex Huang a1bd6d7eb7 Merge branch 'master' into javelin 2012-09-06 16:31:32 -07:00
Wido den Hollander 881a4be126 maven: Add libvirt repository from libvirt.org website
And remove the libvirt-java bindings since we fetch it from an external repository

Signed-off-by: Wido den Hollander <wido@widodh.nl>
2012-09-06 16:51:32 +02:00
Edison Su 5ae15f8bbf first OSS build 2012-09-05 17:45:25 -07:00
Alex Huang 1d0a10c69e Merged master over to javelin to get new poms and maven build 2012-09-05 14:31:24 -07:00
Edison Su ea9121bc8f KVM initial VPC support
Implements
SetupGuestNetworkCommand,SetNetworkACLCommand,SetSourceNatCommand,IpAssocVpcCommand,SetPortForwardingRulesVpcCommand.
Passes basic functionality, though I'm sure there may be some honing to
do.

Also fixes a few minor things found along the way:
 vpc_guestnw.sh wasn't successfully setting up apache due to default
listen IP of 10.1.1.1
 vpc_guestnw.sh was referencing a 'logger_it' function, replaced with
'logger -t cloud'
 system vms were running with OS type "Debian GNU/Linux 5.0(32-bit)",
which was not found in the KVMGuestOsMapper
 the Xen implementation of SetupGuestNetworkCommand had apparently
copied its catch message from UnPlug Nic, fixed string

Send-by: Marcus Sorensen
RB: https://reviews.apache.org/r/6883
2012-09-04 11:45:59 -07:00
Edison Su 3429c55e55 Implement PlugNicCommand,UnPlugNicCommand for KVM
This is part 1 in enabling VPC for KVM. The various commands needing
implementation will be submitted individually unless I'm told to do
otherwise, in case I don't complete all of the commands, such that
someone else can take over or build on my work.

RB: https://reviews.apache.org/r/6859
Send-by: shadowsor@gmail.com
2012-08-30 10:28:03 -07:00
Chip Childers 2ba09d88c8 Patch from Gavin Lee: Change license to ASL2.0 in plugin 2012-08-30 09:17:11 -04:00
Darren Shepherd f7acd8fed8 Create random version for StartupCommands in dev env setup 2012-08-30 08:47:02 +02:00
Koushik Das 0c915cd69e bug CS-16171 : Cannot attach ISO on VMware VM due to Invalid datastore path error 2012-08-30 11:04:30 +05:30
Sheng Yang 60df21a023 Merge S2S VPN for VMware 2012-08-29 14:17:29 -07:00
Edison Su 7bd5c58fc3 fix http://bugs.cloud.com/show_bug.cgi?id=14775, it happened when untagged network created on tagged vlan 2012-08-29 09:46:44 -07:00
Kelven Yang 2300310243 Messaging facility initials for new architecture 2012-08-28 17:58:45 -07:00
Kelven Yang 55c67092d0 Commit for https://reviews.apache.org/r/6547/ 2012-08-28 14:58:04 -07:00
Rohit Yadav fd4a1a39c1 Bug CS-15970: Fixes Redundant router status when host is XenServer 2012-08-28 12:07:33 +05:30
olivier lamy fe8a01106b rename cloud-plugins to cloudstack-plugins 2012-08-27 16:53:51 +02:00
olivier lamy c68dd35b6e Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-08-27 16:44:18 +02:00
olivier lamy a06ed5728c remove intermediate parent poms 2012-08-27 16:43:24 +02:00
Kishan Kavala f1ab3ae94c bug CS-10928: Check for delta cpu utilization before updating stats
status CS-10928: resolved fixed
reviewed-by: Prasanna
2012-08-27 19:40:27 +05:30
olivier lamy 3aa469da2a groupdId is now org.apache.cloudstack 2012-08-25 09:20:21 +02:00
olivier lamy 5ef60aceb1 %s/tab/ws/ 2012-08-25 00:03:23 +02:00
Darren Shepherd 4a4007e652 Add license 2012-08-24 11:18:54 -07:00
Darren Shepherd ebc0fa458a * Maven 3 support
* Pretty Format POM's
* AWS API compiles now
2012-08-24 11:18:54 -07:00
Darren Shepherd f826971fea Maven config, initial commit 2012-08-24 11:18:52 -07:00
Sheng Yang 1289b947f9 S2S VPN: Fix CheckS2SVpnConnectionsCommand on VMware 2012-08-23 18:30:31 -07:00
Kelven Yang d06d6dae72 add maven eclipse project files from Darren 2012-08-23 17:55:20 -07:00
Kelven Yang 9a51ff3bfc Maven worksplace fixes/patches from Darren 2012-08-23 14:26:27 -07:00
Darren Shepherd 2f6cc4b0cb Add license 2012-08-23 14:26:26 -07:00
Darren Shepherd ad54ed1790 * Maven 3 support
* Pretty Format POM's
* AWS API compiles now
2012-08-23 14:26:26 -07:00
Darren Shepherd b8e95e435f Maven config, initial commit 2012-08-23 14:26:25 -07:00
Abhinandan Prateek 879d62d881 enable tampa pre-release 2012-08-23 12:32:10 +05:30
Edison Su 5a1c2dad87 CS-15734 KVM Snapshots show incorrect disk usage.
Changed the code to show virtual size (allocated size).
RB: https://reviews.apache.org/r/6699/
Send-by: saksham.srivastava@citrix.com
2012-08-20 11:22:41 -07:00
kishan 691be5c60e bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic
status CS-15577: resolved fixed
2012-08-17 17:07:13 +05:30
anthony 4b3af0c961 fixed typo 2012-08-15 14:06:07 -07:00
Edison Su 178953e963 Adds missing bit from the original CLVM patch
263216caa5
(https://reviews.apache.org/r/6470/) regarding 'patchDisk' in
createPatchVbd. This same patch should apply cleanly to both master and
4.0 branches

RB: https://reviews.apache.org/r/6615/
Send-by: shadowsor@gmail.com
2012-08-14 16:33:58 -07:00
Kelven Yang f0baaf6a22 Apply patch https://reviews.apache.org/r/6552/ 2012-08-13 17:11:54 -07:00
Mice Xia 3eda2b8c4b Remove @author tag from non third-party source files in plugins folder 2012-08-13 15:04:30 +08:00
Alena Prokharchyk b61468d65c Merge branch 'master' into vpc
Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2012-08-11 18:27:18 -07:00
Edison Su 263216caa5 Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
2012-08-10 13:33:06 -07:00
Edison Su bc12fd2337 Summary: Introduce Vif Driver in KVM
Add BridgeVifDriver and move current vif implementation to it.

    - remove dependency on VirtualRoutingResource.
    - factor out some of the networking code in LibvirtComputingResource
      to BridgeVifDriver.

    Add base class for KVM VifDriver.

    Add VifDriver Interface for KVM.

    RB: https://reviews.apache.org/r/6285
    Send-by: Tomoe Sugihara <tomoe@midokura.com>
2012-08-10 12:05:24 -07:00
Edison Su 9be74d1d1e Revert "Summary: Introduce Vif Driver in KVM"
This reverts commit 7705635804.
Sorry, accidently checked in, this patch needs more tuning
2012-08-10 11:49:12 -07:00
Edison Su 7705635804 Summary: Introduce Vif Driver in KVM
Add BridgeVifDriver and move current vif implementation to it.

- remove dependency on VirtualRoutingResource.
- factor out some of the networking code in LibvirtComputingResource
  to BridgeVifDriver.

Add base class for KVM VifDriver.

Add VifDriver Interface for KVM.

RB: https://reviews.apache.org/r/6285
Send-by: Tomoe Sugihara <tomoe@midokura.com>
2012-08-10 11:34:32 -07:00
Alena Prokharchyk 6cddd1e767 Removed trailing whitespaces and fixed line endings in some files 2012-08-09 23:30:33 -07:00
Alena Prokharchyk c5e3493792 Merge branch 'master' into vpc 2012-08-08 18:38:35 -07:00
Wido den Hollander 2ce632cf0b agent: Fix typo for error message when HVM is not enabled 2012-08-08 22:31:06 +02:00
Wido den Hollander a12a0081e9 agent: Exit when local.storage.uuid is not set
We used to generate a UUID when this wasn't set, but since we aren't writing to
agent.properties anymore we have to make sure the UUID is persistent across restarts.
2012-08-08 22:31:06 +02:00
Wido den Hollander 57a14266d8 agent: Remove dummy debug line
This does nothing
2012-08-08 22:31:06 +02:00
Wido den Hollander 9fe611037f agent: Set default values for all variables 2012-08-08 22:31:06 +02:00
Wido den Hollander c4f847518f agent: Never write to agent.properties
A daemon should never write to a configuration file

Admins might use tools like Puppet and they don't like changing files
2012-08-08 22:31:06 +02:00
Alex Huang 457f3b3dc9 Removed all javax source code from utils package 2012-08-08 12:58:22 -07:00
Alena Prokharchyk 048c5e50cf Merge branch 'master' into vpc
Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Sheng Yang c4eadf3011 S2S VPN: CS-15884: Delete iptables rules after delete vpn connection 2012-08-07 16:32:22 -07:00
Wido den Hollander f1053f3e3e kvm: Only select emulators which are x84_64 architecture
Libvirt can also return a bunch of emulators for eg ARM and S390

We filter those out since we do not support these architectures.

This way we don't try to start a x86_64 instance with a S390 emulator
2012-08-07 23:17:52 +02:00
Wido den Hollander a1b9b52164 kvm: Remove hardcoded 'cloud' qemu binaries for Hypervisor detection
With the upcoming Apache release we don't ship custom Qemu builds.

libvirt should provide us with the correct information.
2012-08-07 23:17:52 +02:00
Sheng Yang 46a12b378c CS-15243: Add service combination check at create network offering 2012-08-07 13:17:48 -07:00
Alena Prokharchyk 95449da4be Merge branch 'master' into vpc 2012-08-07 11:37:45 -07:00
Chip Childers 81ff7a09fd CS-15875 resolved via patch from Andy Gross. 2012-08-07 14:10:11 -04:00
Wido den Hollander 5fa300cd9c kvm: Define CPU shares in domain XML
Since libvirt 0.9.0 this can be specified in the XML.

This used to be set by invoking virsh after starting the instance, but this is cleaner.
2012-08-07 17:49:58 +02:00
Wido den Hollander 9212995501 kvm: Fix two small typos 2012-08-07 17:19:38 +02:00
Sheng Yang 1b5103c501 S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime 2012-08-06 15:19:26 -07:00
Alena Prokharchyk 5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
Alena Prokharchyk e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -07:00
Chip Childers 3a882fa17c License header updates for the plugins folder. 2012-08-03 09:07:43 -04:00
anthony 9b43753399 VPC : handle Revoke rules for staticroute 2012-08-02 18:59:49 -07:00
Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
Wido den Hollander 1276aedd35 rbd: Remove debug line
This is no longer needed. It was here for testing purposes, but it was actually a bug in libvirt which has been resolved.
2012-08-02 23:05:00 +02:00
Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
Alena Prokharchyk e0c85c0d41 VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands 2012-08-01 18:19:03 -07:00
Kelven Yang 1aa4ed84b9 Merge VPC support in VMware integration 2012-08-01 17:27:59 -07:00
Edison Su 05df0a1965 Another clean up for unnecessary parameter conn Clean up unused
parameter conn. Add test for LibvirtVMDef Add support for ethernet type
RB: https://reviews.apache.org/r/6284/
Send-by: tomoe@midokura.com
2012-08-01 13:59:11 -07:00
Wido den Hollander 2ffc9907f7 kvm: Use libvirt for polling storage pool capacity and allocation
Since we are using libvirt for handling our storage pools we should rely on that information as well.

Before fetching the capacity we refresh the pool so libvirt has the most up-to-date information.

This is not needed with newly created pools since libvirt does a refresh on creation.
2012-08-01 17:18:11 +02:00
Wido den Hollander 34ed15e44e kvm: Remove main methods in various classes
This is dead code which seems to be in there from the VMOps time.

No reason for this to be here, so this can safely be removed
2012-08-01 14:42:31 +02:00
Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
Wido den Hollander cc08eee215 plugin: Rename cloud-kvm.jar to cloud-plugin-hypervisor-kvm.jar
This way we stay consistent with naming our plugins.
2012-07-31 22:18:56 +02:00
Edison Su 7a0a9231c3 Move KVM related code into plugins/hypervisor/kvm, a new jar file is
created: cloud-kvm.jar
2012-07-30 14:55:47 -07:00
kishan 9611a017e9 bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:37:46 -04:00
Sheng Yang 8eee8f342e S2S VPN: CS-15650: Add connection status update to s2s vpn 2012-07-27 16:28:06 -07:00
anthony 2fc1dc0df6 VPC : vpc integration code for XenServer hypervisor 2012-07-27 15:54:30 -07:00
Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
kishan 468f2720eb bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:13:18 +05:30
Edison Su 764678f558 CS-15521 Xenserver based User VM failed to HA when vrouter runs on ESXi
return false as an answer when executing PingTestCommand in
VMwareResource
RB:https://reviews.apache.org/r/5903/
Send-by: mice_xia@tcloudcomputing.com
2012-07-26 10:43:33 -07:00
Alena Prokharchyk 6420ecbd6f Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
Edison Su 576d093e9c fix CS-15432 Failed to detach VMware tools ISO after VMware tools
installation
RB: https://reviews.apache.org/r/5738/
Send-by: mice_xia@tcloudcomputing.com
2012-07-24 13:44:55 -07:00
Sheng Yang f1e2be7157 CS-15511: Fix parameter transfer in bash
[Dropped Vmware support in this commit, due to lack of VMware support in VPC now]

Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
2012-07-23 14:51:40 -07:00
Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
Hugo Trippaers 79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Alena Prokharchyk 353423acec Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
Edison Su 27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -07:00
Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
Vijayendra Bhamidipati b957933a0e Making nexus vsm password encryptable 2012-07-03 17:26:05 -07:00
Sheng Yang 8d4079d477 CS-6840: Add hypervisor commands for site-to-site vpn
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2012-07-02 16:28:44 -07:00
David Nalley 9aa0edf7a4 License header updates for the ovm folder from Chip Childers
https://reviews.apache.org/r/5706/
2012-07-02 09:52:55 -04:00
Alena Prokharchyk 1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Edison Su 5f6387e113 add clouddev 2012-06-27 23:28:34 -07:00
Murali reddy 8197f1f07c moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware 2012-06-26 19:48:55 -07:00
Murali reddy 550b22576f Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00
frank a2d49bef69 Change OVM script deploy target in line with Alex re-packaging change
fix RPM build, don't install cloud-console-proxy.jar as there is not such package anymore
2012-06-20 10:45:56 -07:00
Alex Huang e2a32ab4f7 Introduced plugins directory.
Moved ovm into plugins.
Introduced build.xml for ovm.
2012-06-19 18:27:09 -07:00