16447 Commits

Author SHA1 Message Date
Rohit Yadav
5f8a2ee9be CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-22 19:15:01 +05:30
Hugo Trippaers
bc4abcf14d Capture stderr and stdout of the jsvc run services (agent and usage) 2013-02-22 14:13:57 +01:00
Pranav Saxena
55d67a0ff0 Merge branch 'Commit-Ratio' 2013-02-22 18:09:39 +05:30
Pranav Saxena
ab24e84191 Cpu and Memory overcommit ratio Ui integration 2013-02-22 18:06:59 +05:30
Bharat Kumar
23e54bb0f4 Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
Saksham Srivastava
ea3db2f073 CLOUDSTACK-705 IP Address reservation for Isolated Guest Networks
CloudStack uses Guest CIDR for dhcp-range for the Guest VMs. The entire
CIDR is used by CloudStack for assigning IPs to Guest VMs. IP Address
Reservation will allow part of address space to be used fornon CloudStack
hosts/physical servers also, by restricting the address space of CloudStack
Guest VMs. Reservation can be configured using update Network API by specifying
guestvmCidr as an additional parameter. Reservation will be applicable for
Isolated Guest Networks including VPC. reservediprange in the response
will return the IP range that can be used for non Cloudstack hosts.

Tested manually the following scenarios:
Applying reservation when there are running VMs inside the
guest_vm_cidr.
Applying reservation when there are running VMs outside the
guest_vm_cidr.(not allowed)
Applying reservation when external device like Netscaler is configured
in the guest_cidr.
Applying reservation in VPC tiers.
Applying reservation outside the range of guest_cidr.(not allowed)
2013-02-22 15:50:33 +05:30
Mice Xia
79fee523bd CloudStack CLOUDSTACK-774 add baremetal related class declaration in nonossComponentContext.xml 2013-02-22 15:56:54 +08:00
Rohit Yadav
e0008844df client: Remove duplicate baremetal dependency, regression from 1f15c1e9
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-22 11:38:54 +05:30
Rohit Yadav
200f89d801 api: UUID entity type should be for Long fields, fix regression from a22403ed
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-22 11:37:49 +05:30
Mice Xia
dae57c1ab2 add missing license header reported by rat 2013-02-22 13:22:14 +08:00
Sheng Yang
a0762bc4a7 CLOUDSTACK-1303: Fix NPE when extend vlan with ipv4 only 2013-02-21 18:02:50 -08:00
Prachi Damle
6823adb3ac CLOUDSTACK-1367 NPE noticed in logs while AgentMonitor is monitoring the host ping interval
Added null check. If the host is not found, we dont ping anymore.
2013-02-21 17:40:08 -08:00
frank
1689062334 remove BareMetalVmManagerImpl.java thiat is unused 2013-02-21 17:05:19 -08:00
Edison Su
3bb713c5ce fix adding nfs primary storage and build and load 2013-02-21 16:24:39 -08:00
frank
8a523476ec CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

remove workaround for unable to deploydb
remove wrongly added region upgrade entries
2013-02-21 15:48:26 -08:00
frank
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
frank
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
frank
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
frank
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
frank
54741a2b0f CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

add api annotation to baremetal related api
2013-02-21 15:41:21 -08:00
Brian Federle
fa14380ac9 Remove old list view actions 2013-02-21 15:21:31 -08:00
Brian Federle
1ac86e96cb Quick view UI: Fix to support multiple quick links
There was previously a limitation in the detail view/quickview where
only 1 'view all' link was visible per page. Change this to show n
number of view all links, if an array is passed to 'viewAll.' This also
lowers the # of clicks necessary to navigate to some items.

This also adds more view all buttons to instances, storage, and system
resources.
2013-02-21 15:09:03 -08:00
Brian Federle
fe6fc0a20e Remove old screenshot files from UI folder 2013-02-21 15:01:13 -08:00
Sheng Yang
667a1d18a4 CLOUDSTACK-1288: Fix regression on remove LB rules
It's a regression caused by:

   commit 69d24545c4f0e316dba534b6d5d99308795db6d4
   Author: Murali Reddy <murali.reddy@citrix.com>
   Date:   Fri Feb 8 18:50:18 2013 +0530

       CLOUDSTACK-1208: Failed to shutdown guest network

       Firewall manager was being used instead of LoadBalancingRules manager
       while applying the load balancer rules in shut down network. Changing it
       to LoadBalancingRules manager.

The parameter transferre to applyRules() should be lbRules, rather than the lbs
object.
2013-02-21 14:46:22 -08:00
Prachi Damle
d84a8601e5 CLOUDSTACK-1362: EC2 dns-name filter support for EC2 describeInstances API is broken
Mapped CS UserVm 'name' propertyto the dns-name value to filter out the results.
2013-02-21 14:01:52 -08:00
Pranav Saxena
31c26beb7f zone wide primary storage server side changes 2013-02-22 03:28:01 +05:30
Chip Childers
6cc1123a3e Correcting license headers that broke the build
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-21 16:29:05 -05:00
Pranav Saxena
6ef7928a9c zone wide primary storage 2013-02-22 02:53:26 +05:30
Brian Federle
d0d6ba9781 Add new dropdowns to primary storage form
Adds the following new fields, to support targeted storage pool:

-Scope drop-down (zone/cluster/host)

-Host list drop-down
2013-02-21 12:23:27 -08:00
Edison Su
18e496b057 rebase to master 2013-02-21 11:22:50 -08:00
Edison Su
8eca74134a rebase to master 2013-02-21 11:22:50 -08:00
Hugo Trippaers
9b5774363d Revert "Make sure initial log messages go somewhere for agent and usage"
The dreaded wrong-tree-active-syndrome

This reverts commit 9589f9fe5f401df90f7b356c9186d012c8f887ab.
2013-02-21 11:22:50 -08:00
Edison Su
ae902590d3 fix snapshot 2013-02-21 11:22:50 -08:00
Edison Su
fb4036ece4 add test folder for snpahost project 2013-02-21 11:22:49 -08:00
Edison Su
0f532c4b3a rebase to master 2013-02-21 11:22:49 -08:00
Edison Su
ff047e75d3 refactor snapshot, move existing snapshot code into its own snapshotstrategy 2013-02-21 11:22:49 -08:00
Edison Su
020be66f9d add copy volume and create volume from snapshot 2013-02-21 11:22:49 -08:00
Edison Su
621a779446 use correct disk offering id 2013-02-21 11:22:49 -08:00
Edison Su
0b86b33c56 rebase to master 2013-02-21 11:22:48 -08:00
Edison Su
ec09e34f86 fix downloading template 2013-02-21 11:22:48 -08:00
Edison Su
a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Rohit Yadav
d81209210c client: Add baremetal and ucs as dependencies
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-21 23:52:05 +05:30
Rohit Yadav
16f51227c6 client: Fix web.xml string processing based on profile, oss or nonoss
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-21 23:52:05 +05:30
Parth Jagirdar
8134885e2d CLOUDSTACK-1180: UI test automation using selenium
Description:
	Adding selenium test scripts.
2013-02-21 12:04:18 -05:00
Hugo Trippaers
368a5d5a9a Prachi's commit 20a747601c2664b2b8128f7a180f7e94f6b0b1e1 introduced a
new call to network.getPhysicalNetworkId() which wasn't mocked yet in
the nvp plugin unittests.(cherry picked from commit aea5b268b4590775eff6291ddfbbd6de777d1b63)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-21 14:08:56 +01:00
Pranav Saxena
82c2e3052e Merge branch 'Reset-VM' 2013-02-21 16:29:42 +05:30
Pranav Saxena
35d8905081 Reset a VM detail view display 2013-02-21 16:26:31 +05:30
Pradeep Soundararajan
3279b41465 Commit review 9409 Added a global package name in the packaging script
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-21 10:40:16 +01:00
Harikrishna Patnala
6c01b62cdc CLOUDSTACK-667: VM's base image update facility 2013-02-21 15:04:29 +05:30
Rohit Yadav
59db01ce6e CLOUDSTACK-1347: Don't enforce not null rule on queue_proc_time of sync_item_queue
In c63dbb88042d7eabea2664c2b608c51792fc9f18 I removed the rule from create-schema:
-  `queue_proc_time` datetime COMMENT 'when processing started for the item',

But, upgrade path schema-40to410.sql had a different rule which caused the bug:
+ALTER TABLE `cloud`.`sync_queue_item` ADD `queue_proc_time` DATETIME NOT NULL
COMMENT 'when processing started for the item' AFTER `queue_proc_number`;

In this fix we just revert to whatever rule was defined in create-schema as the
developer may have forgetten to fix same rule in create-schema and upgrade path.
This commit can be reverted or the code be fixed if we want that queue_proc_time
cannot be null.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-21 15:01:00 +05:30