Ragnar B. Johannsson
83b3580c32
Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss
...
Conflicts:
client/tomcatconf/commands.properties.in
core/src/com/cloud/vm/UserVmVO.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2011-01-12 17:06:08 +00:00
Ragnar B. Johannsson
3e59707dd2
Added user_vm_details table and corresponding access objects.
...
Moved saved encrypted passwds for getVMPassword API cmd to this new table.
Removed SSH keypair id from UserVm - only public key is needed.
2011-01-12 16:32:36 +00:00
nit
58a80d57cc
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2011-01-12 19:37:42 +05:30
kishan
6bb4af8381
bug 6947: removed network type from service offering APIs
...
status 6947: resolved fixed
2011-01-12 19:13:09 +05:30
nit
dce1e2031b
bug 7519 : Extract links would have Java genereated UUID instead.
2011-01-12 16:53:42 +05:30
Frank
870d0835a5
bug 7722: open vswitch - add entities to tunnel table/vlan mapping table when
...
host connect, this make these tables lock free(for table lock)
2011-01-11 19:04:37 -08:00
Alex Huang
ad4ed5b2fd
added hypervisor type to vm
2011-01-11 18:02:09 -08:00
anthony
1fd84fbcfa
xen hyperviosr used 128 M memory
2011-01-11 15:19:11 -08:00
nit
ffe387ab5b
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2011-01-11 20:08:24 +05:30
nit
6850a0ae9a
bug 7519 : Opening eth2 for public traffic on ssvm. Implementing the ip firewall for zone to zone copy in the Apache layer. Disabling directory listing for extract server root.
2011-01-11 20:05:35 +05:30
Frank
c6683c2eab
bug 7722: open vswitch -
...
refine ovs plugin, create a separate plugin instead of messing with vmops
refine gre tunnel, maintains tunnel in database instead of plugin
fix an arp issue cause by overlap vlan range
2011-01-11 02:55:36 -08:00
anthony
9e4c6351e3
bug 5756:
...
only fake PV driver for PV kernel
stop VM if VM doesn't have PV driver
status 5756: resolved fixed
2011-01-10 14:06:58 -08:00
Frank
a964494332
bug 7722: open vswitch - align some data type with master branch
2011-01-08 17:31:00 -08:00
Frank
e9959d32a9
bug 7722: open vswitch - handle router when schedule a work
2011-01-08 16:28:47 -08:00
Frank
ec643c7e59
bug 7722: open vswitch - refine code; add normal flow makes vswitch work as
...
normal L2/L3, otherwise the output packet cannot find right output port
2011-01-08 16:28:47 -08:00
Frank
6f9f8b145b
bug 7722: open vswitch - complete
2011-01-08 16:28:47 -08:00
Frank
9d2916ffcc
it works
2011-01-08 16:28:47 -08:00
Frank
c94b6acadf
bug 7722: open vswitch - works at VM start time, need fullsync() and flow clean in next
2011-01-08 16:22:59 -08:00
Frank
5c01c42ba7
fix bug 7722, code complete basic architecture
2011-01-08 16:20:39 -08:00
Alex Huang
03128cadf6
got rid of monitor
2011-01-07 13:41:15 -08:00
anthony
b07162f30a
merge from 2.1.x deb87aa5e7
...
correct definition
2011-01-06 19:41:00 -08:00
Ragnar B. Johannsson
32c68e1583
API cmds for SSH-keys manipulation and VM passwds retrieval.
...
These include five new API cmds as well as changes to deployVirtualMachine to
specify an optional name of an SSH key to pass to the VM when starting. When
an SSH key is specified with a password-enabled template the newly created
password is encrypted with the SSH public key and can be retrieved via the
getVMPassword cmd. It is then the user's responsibility to decrypt retrieved
passwords with the correct SSH private key.
2011-01-06 13:34:07 +00:00
alena
916b516d13
bug 7878: Fixed Basic zone functionality - uservm/systemvm/domR start
...
status 7878: resolved fixed
2011-01-06 15:44:13 -08:00
abhishek
6cade1aa1d
adding missing code for programming default network rules for user vm on each of its nics, for the direct networking case
2011-01-05 15:22:12 -08:00
anthony
67928262f0
add Utuntu 10.24 for xenServer
2011-01-04 17:56:39 -08:00
anthony
57ee66a22d
XenServer can tell if the VM is shutdowned from inside,
...
if VM is shutdowned from inside, a new state "Shutdowned" is reported to MS and this VM will not be restarted even HA is enabled for this VM
2011-01-04 17:40:13 -08:00
Alex Huang
4eba6d10d7
Moved State into VirtualMachine like other States of objects
2011-01-04 15:01:34 -08:00
alena
0b7a15ab99
bug 7348: reapply PortForwardingRules (including 1-1 Nat), LB rules, Vpn as a part of domr Stop/Start
...
status 7348: resolved fixed
More fixes:
* Update user_statistics on each domR stop/reboot
* Reset dhcpData/userData as a part of domR stop/reboot
* More logging for domR commands
2011-01-03 23:00:05 -08:00
anthony
fc811e8d49
bug 7794: sleep should be in out of try statement
...
status 7794: resolved fixed
2010-12-30 16:09:28 -08:00
Kelven Yang
e7749afdfe
Bug 7772: Add hypervisor type to snapshots table, fix issues with createVolumeFromSnapshot if snapshot was taken under data volume
2010-12-29 21:54:17 -08:00
alena
bd788b1827
Fixed RemoteAccessVpn apis
2010-12-29 21:36:44 -08:00
anthony
98146d3b15
bug 5559: support snapshots on local disk
...
status 5559: resolved fixed
2010-12-29 19:55:12 -08:00
keshav
3da09345c9
Changed schema to keep track of which public IP address and host a user statistics entry is for
2010-12-29 19:14:35 -08:00
Alex Huang
544fa7ff1b
remote access vpn, user ip address changes
2010-12-29 09:32:54 -08:00
Alex Huang
1afb34d38e
Added code to do migration
2010-12-29 09:32:54 -08:00
edison
2d722e685b
fix exception in PingRoutingWithNwGroupsCommand, due to no json serialize for pair<long, long>
2010-12-28 10:50:12 -08:00
edison
aa99173784
fix pf rules for kvm
2010-12-27 15:27:06 -08:00
edison
4b57e3c239
fix ipassoc command
2010-12-27 11:27:44 -08:00
anthony
a4e791a10c
now, you can remove the last host in a cluster
2010-12-23 20:42:31 -08:00
anthony
1646bf6312
when add an iscsi storage pool, always try to intrudec it first.
2010-12-23 15:17:23 -08:00
nit
a6fca4ee64
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-12-23 15:09:56 +05:30
nit
1f4cb9b11e
bug 7519 : extract functionality - changing it to support http protocol. Making the URL's robust against the start and stop of agent on ssvm.
2010-12-23 15:08:46 +05:30
anthony
5a0fa3380d
SetupAnswer need to indicate whether reconnect is needed
2010-12-22 18:11:32 -08:00
Kelven Yang
1805c73363
1) Add HostStats support to vmwre
...
2) Normarlize HostStats to make it generic to all hypervisors
2010-12-22 16:27:02 -08:00
kishan
2d7979ec88
bug 7504: UsageEvent dao and related objects
2010-12-22 18:11:40 +05:30
anthony
7c44823a2e
bug 7625: setVCPUsMAX first then setVCPUsAtStartup
...
status 7625: resolved fixed
2010-12-21 19:41:13 -08:00
anthony
c0de8fd1b7
bug 7609: check if the vm exists before get vnc port
...
status 7609: resolved fixed
2010-12-21 11:04:59 -08:00
Chiradeep Vittal
1216ffd21a
WIP
2010-12-21 11:04:27 -08:00
anthony
91d8e6ffcc
bug 7617: use correct patch path for oss
...
status 7617: resolved fixed
2010-12-21 10:30:22 -08:00
Alex Huang
0ecb0118ec
renamed the domainrouter services
2010-12-21 03:56:01 -08:00
anthony
4063ce65a8
bug 7546: it is caused by slow vdi-copy, there are several vdi-copy as the same time, it triggers 30 minutes timeout.
...
change vdi-copy to async and the timeout is 2 hours now, hope this mitigate the issue.
status 7546: resolved fixed
2010-12-20 18:37:50 -08:00
Chiradeep Vittal
d7c81b702e
WIP 3
2010-12-20 17:46:14 -08:00
Chiradeep Vittal
5c9a11523b
WIP 2
2010-12-20 17:28:59 -08:00
Chiradeep Vittal
6da6330c3f
WIP to fix domr network integration
2010-12-20 17:28:20 -08:00
alena
b228ae6acb
Set domR access details (name, privateIp) for various commands - PF/LB/IPAssoc
2010-12-20 17:22:52 -08:00
abhishek
d63e61c915
adding some code to ensure system vms come up for the direct untagged case (zynga setup). Also, checking in some changes on behalf of Alena
2010-12-20 16:33:57 -08:00
anthony
57de81983f
add XenServer 5.6 FP1 specific guest os type
2010-12-20 15:47:57 -08:00
anthony
af2ce80621
add XenServer56FP1Resource.java
2010-12-20 14:56:22 -08:00
edison
bf1f6a2998
Don't need this logic anymore, as xenserver can't handle this case:
...
can't boot from an iso that different from the vm's template
Revert "more changes to the attach/detach iso and bootloader flow"
This reverts commit d8f771e05b .
2010-12-20 14:17:35 -08:00
anthony
2be0b45297
support xenserver 5.6 fp1 in oss
2010-12-20 14:18:10 -08:00
alena
3cd989cbef
1) Changed format for IpAssoc command. Instead of sending the ip addresses to assign one by one, we send a list of ip addresses to the agent.
...
2) Fixed createVM with multiple networks
2010-12-20 09:37:46 -08:00
anthony
baa6666897
create xenserver 5.6 patch file
2010-12-17 20:21:28 -08:00
anthony
950ed41436
fixed build
2010-12-17 20:07:09 -08:00
anthony
3a6d0e79a6
refactor
2010-12-17 20:07:08 -08:00
anthony
d50d20d1b6
refactor
2010-12-17 18:12:00 -08:00
anthony
9adf417dc2
refactor
2010-12-17 18:12:00 -08:00
anthony
7faf41e04e
pass pooluuid to xen.configure
2010-12-16 18:55:40 -08:00
Alex Huang
adc9ffe034
more changes
2010-12-16 17:17:02 -08:00
Alex Huang
5b11649c55
Removed even more old code
2010-12-16 17:17:02 -08:00
anthony
6419e49977
add guid in cluster table
2010-12-16 16:28:56 -08:00
abhishek
5154ba1539
bug 6361: this is a good point to commit; 1st round of refactor is done, code is clean compiling and ms is deploying
2010-12-16 15:37:19 -08:00
Alex Huang
a7a4d92739
Renamed Start2 to Start
2010-12-16 14:18:53 -08:00
Alex Huang
65d0b32182
removed a bunch of old code
2010-12-16 14:04:32 -08:00
anthony
55f2f29271
change XenServerConnectionPool from hostuued based to pooluuid based
2010-12-15 18:55:37 -08:00
alena
b383aaceec
bug 7517: Added an ability to specify vm's host name during vm Deploy using "name" parameter. The parameter is optional.
...
status 7517: resolved fixed
Name should follow these rules:
* must be between 1 and 63 characters long and may contain only the ASCII letters 'a' through 'z', the digits '0' through '9', and the hyphen ('-').
* can not start with a hyphen, and must not end with a hyphen
Once name is set (during vm deploy), it can't be modified.
2010-12-15 15:52:16 -08:00
anthony
9c1447c80e
pass conn to function
2010-12-14 17:42:54 -08:00
anthony
31c1076687
fixed adding host
2010-12-14 16:49:11 -08:00
anthony
fbbf78efbb
intialize only get xenserver info
2010-12-14 15:24:21 -08:00
anthony
dd8be65399
synchronize xenserverconnection function on pooluuid
2010-12-14 11:12:00 -08:00
abhishek
5e61be67fd
fix bugs in allocator
2010-12-13 16:42:25 -08:00
alena
d077b127aa
bug 7498: fixed search by keyword in listUserVm/listSystemVms/listRouters commands
...
status 7498: resolved fixed
2010-12-13 15:22:11 -08:00
Alex Huang
c8961453a4
mac addresses for private ip addresses
2010-12-10 13:36:40 -08:00
Alex Huang
d27c0c4b01
mac addresses for private ip addresses
2010-12-10 13:36:40 -08:00
abhishek
d8f771e05b
more changes to the attach/detach iso and bootloader flow
2010-12-10 13:24:57 -08:00
abhishek
a5c368f7e2
bug 7472: fixing the bootloader issue, wherein a vm with iso attached fails to boot up, when trying to start from a stopped state
...
status 7472: resolved fixed
2010-12-10 10:40:21 -08:00
Alex Huang
2d4432d87e
network shutdown code
2010-12-10 08:38:20 -08:00
edison
712953156b
fix boot from iso/attach iso/disks issue
2010-12-09 14:25:44 -08:00
keshav
198cab4dee
Added support code for external firewalls and loadbalancers. Added new host types and startup commands, and enabled NicVO to reserve IPs for external network resources.
2010-12-09 11:40:02 -08:00
Alex Huang
e49fab6903
Renamed MauricMoss now that we're going public with this.
2010-12-08 09:28:01 -08:00
Kelven Yang
51b55d8ae9
Carray storage pool uuid in VolumeTO to let hypervisor resource to identify storage easier
2010-12-06 15:57:40 -08:00
Kelven Yang
904bb3ea26
Fix a problem for Xen resource when it handles VPN command
2010-12-06 14:41:43 -08:00
Alex Huang
87626bea6b
start vm is working
2010-12-06 14:17:53 -08:00
anthony
aa0fed787e
move network group to oss
2010-12-06 13:08:29 -08:00
edison
41fdbfc65e
new allocator
2010-12-04 14:59:39 -08:00
anthony
ef9c9b8c5f
split scripts to premium-script
2010-12-03 20:53:53 -08:00
anthony
ef38551225
install ubuntu 10.04 as HVM , but run it as PV
2010-12-03 19:41:50 -08:00
Kelven Yang
280884f6d7
Work around VMware problem about detaching volume that has snapshot been linked with it
2010-12-03 18:59:23 -08:00
Kelven Yang
cc7dc5e6be
Persist disk chain info when we detach a volume, check disk chain info when we attach a volume, this is required when snapshot operations are involved in vwmare
2010-12-03 18:59:23 -08:00
Alex Huang
9a70ee54f0
portforwarding is working
2010-12-03 08:48:03 -08:00
Alex Huang
223688d0bf
Port forwarding rules and load balancing rules rewrite
2010-12-03 08:48:02 -08:00
alena
f8a687ab23
1) Implemented create/list/deleteNetworkOffering create/delete/listNetwork APIs.
...
2) Added networkIds parameter to deployVMCmd - accepts list of networks ids separated by coma.
3) Changed domainRouter/systemVm/userVm response to return list of Nics associated with the vm.
2010-12-02 19:30:17 -08:00
anthony
6f1eb4bf44
bug 7144: return snapshotId with jobid
...
1. manual and recursive snapshot use the same command
2. upgrade from 2.2 beta1 to beta need to execute schema-22beta1to22beta2.sql and data-22beta1to22beta2.sql
3. upgrade from 2.1GA to 2.2GA need to execute schema-21to22.sql and data-21to22.sql
status 7144: resolved fixed
2010-12-02 19:23:34 -08:00
anthony
f7b930e686
bug 7291: return correct install path for createtemplatefromsnapshot
...
add more check for deletetemplate command
status 5873: resolved fixed
2010-12-01 18:53:45 -08:00
anthony
4b20796467
remove patch domr logical
2010-12-01 16:32:33 -08:00
anthony
5584177dbb
bug 7209: check otherconfig before update
...
status 7209: resolved fixed
2010-12-01 16:11:47 -08:00
abhishek
9a6eaaf21f
this is a good point to commit the code; have the basic domain specific service offering working
2010-12-01 09:53:13 -08:00
nit
3735ba1466
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-12-01 21:47:50 +05:30
nit
a703f54ccb
bug 7314 : Extract Api - Check whether http server is running on ssvm and if not try to start it.
...
status 7314: resolved fixed
2010-12-01 21:47:20 +05:30
will
c67d26cec4
bug 6969: First step of now displaying pending async jobs for listXXXCommands. There is a lot more cleanup and fixing to do but all commands acting against VirtualMachines now work.
2010-11-30 19:12:09 -08:00
will
de92288e3b
Adding xenserver-5.6.0-1.jar to eclipse classpath and removing 5.5
2010-11-30 12:19:49 -08:00
Kelven Yang
54f177cacc
1) Make generic dao be able to persist UTF-8 string for internationalization support
...
2) Undo gson Unicode escape in API response object to avoid double escaping which can break Javascript from getting correct text content
3) Correct API layer in dealing with character encoding
4) Remove double escape in cloud.core.js
2010-11-30 09:40:54 -08:00
anthony
fb0675bbf4
bug 7365: return both physical and virutal size when creating private template
...
status 7365: resolved fixed
2010-11-29 18:58:48 -08:00
anthony
d3325de5ae
1. limit xs-tools in xenserver related java file
...
2. don't populate xs-tools to template_host_ref
3. introduce a new template type PERHOST, which doesn't need to be populated to secondary storage
2010-11-29 18:21:08 -08:00
anthony
b420ec7797
UNKNOWN state is not used by xenserverJava
2010-11-29 15:26:08 -08:00
anthony
fff1dd874a
fix classpath for xenserver-5.6.0-1
2010-11-29 15:26:07 -08:00
anthony
8b90fd51f8
bug 7339: use base copy size instead of snapshot size
...
status 7339: resolved fixed
2010-11-29 14:04:51 -08:00
Alex Huang
d40700b286
Changed firewall rule's constructor
2010-11-29 09:38:13 -08:00
anthony
30fa6530f9
bug 6088: track template physical size in template_host_ref table
...
add migration from 21 to 22
after migration , SSVM needs to stop/start
status 6088: resolved fixed
2010-11-24 20:05:52 -08:00
Kelven Yang
4a2d0ac41b
Correct Eclipse project setting
2010-11-24 15:17:09 -08:00
Kelven Yang
dd9b1634f7
Allow host behind cluster to return real VNC host IP address
2010-11-24 15:17:08 -08:00
abhishek
bd42a02894
bug 7322: fixing this issue, to ensure the 1:1 NAT rule works well with a router reboot
...
status 7322: resolved fixed
2010-11-24 10:36:22 -08:00
abhishek
606bc6d99e
corresponding changes in the kvm resource
2010-11-24 10:16:35 -08:00
abhishek
1950bf7a99
changing the nat feature to work with kvm
2010-11-24 10:04:24 -08:00
nit
8ea124ae79
bug 7046 : extracting templates should allow for exclusion of some templates. An attribute "extractable" would be set on templates by the template owner at upload time. It would specify if we allow the template to be extracted from the system. Default would be true ie "allow extraction". If set to false, it would not be possible to extract the template or any derivatives of the template. For example, volumes, snapshots or templates from that template.
...
status 7046: resolved fixed
2010-11-24 18:37:54 +05:30
edison
bb790b41f7
bug 7322: fix NPE when setting firewall rule for 1:1 NAT on kvm
...
status 7322: resolved fixed
2010-11-23 20:47:23 -08:00
anthony
5d083fb460
bug 6569: eject CD before migration
...
need to document it, after migration, CD is gone
2010-11-23 19:24:50 -08:00
anthony
c39d211a48
merge from 2.1.x
2010-11-23 18:55:23 -08:00
alena
674d68fc58
bug 7311: Use StoragePoolVO copy constructor in deleteStoragePoolCommand
...
status 7311: resolved fixed
2010-11-23 18:02:31 -08:00
alena
8dfd7b176e
bug 7313: applying Alex's fix.
...
status 7313: resolved fixed
2010-11-23 18:02:30 -08:00
Anthony Xu
7518488672
bug 7293: return complete installpath for createprivatetemplatefromvolume
...
status 7293: resolved fixed
2010-11-23 16:22:51 -08:00
Chiradeep Vittal
09472f1b65
bug 7284: bug in copy constructor cause dhcp server in direct tagged vlan to think it is a virtual router
...
status 7284: resolved fixed
2010-11-22 22:19:21 -08:00
alena
b7eefe1836
Gson deserialization: return JsonNull object when object list is empty.
2010-11-22 14:56:25 -08:00
alena
a646745516
bug 7227: applying Alex's fix - different way of desirializing List objects.
...
status 7227: resolved fixed
2010-11-22 14:08:43 -08:00
Alex Huang
d38f7fd56d
Moved DAO to server
2010-11-22 07:40:41 -08:00
Alex Huang
1e44925564
api refactoring
2010-11-21 12:00:21 -08:00
Anthony Xu
f6836b2cb9
find the system ISO at creating system VM , not at initialization
2010-11-19 19:22:22 -08:00
Alex Huang
5b4a6f27db
Changed networkconfigurations to network as per Sheng's suggestion
2010-11-19 15:44:42 -08:00
abhishek
726cf09274
whilst fixing the iso bug, i realized that the public isos werent being returned for the regular user when he tries to attach the iso to the running vm. adding a listpublicisos() method for a regular user, which will take care of the same
2010-11-19 14:20:07 -08:00
abhishek
516e944d2c
bug 5892: adding the xs-tools.iso to the list resp by implementing a search based on the xs-tools.iso
...
status 5892: resolved fixed
2010-11-19 13:57:12 -08:00
edison
0c35f2f743
bug 7237: disk size is passed in diskProfile, no need size parameter in createcommand
...
status 7237: rresolved fixed
2010-11-19 11:55:27 -08:00
Chiradeep Vittal
394554770e
Enforce user limit on number of vpn users
2010-11-18 18:38:29 -08:00
Anthony Xu
32e08a9cc7
bug 7226: if private NIC doesn't have IP , throw execption, then adding host fails
2010-11-18 17:03:04 -08:00
Anthony Xu
4d053964b6
remove zfs related staff, which is not used
2010-11-18 14:43:20 -08:00
Kelven Yang
1fa2df99cc
Merge a fix in 2.1.x branch back to master
2010-11-18 14:42:53 -08:00
Chiradeep Vittal
c53e165eaa
bug 6971: bring back l2tp port 1701
2010-11-18 14:06:01 -08:00
Chiradeep Vittal
a7547846bf
bug 6971: Dont confuse PF rules added for VPN to be LB rules
2010-11-18 14:05:28 -08:00
Chiradeep Vittal
ea0680ef9c
Gson 1.5 doesnt handle cgi objects very well -- ensure that VO inside agent command is a POJO
2010-11-18 14:05:03 -08:00
Alex Huang
a73e3dc9ac
new networking can be set by use.new.networking
2010-11-17 17:51:17 -08:00
Kelven Yang
5490577469
1) Remove forwarding between eth1 and eth2 as it does not solve the problem of asymmetic routing
...
2) correct Eclipse project settings
3) If VM is hosted by vmware hypervisor, give the previous host preference to start on to fit VMware's VM-centric model
2010-11-17 15:55:04 -08:00
alena
9fefa33a36
bug 5701: listNetworkGroups api - apply page size parameter to the NetworkGroup instead of IngressRule.
...
status 5701: resolved fixed
2010-11-17 15:34:45 -08:00