date:20131029

[2/3] git commit: updated refs/heads/hyperv to ee0788b

2013-10-29 Thread rajeshbattala

Fixed the issues for ssvm and cpvm to wait until it gets configured and then 
return the status. Made checksum method to return true.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/279793e5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/279793e5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/279793e5

Branch: refs/heads/hyperv
Commit: 279793e530dd200201ca2795656d95091a09adf0
Parents: 7ac1ac9
Author: Rajesh Battala 
Authored: Tue Oct 29 15:43:28 2013 +0530
Committer: Rajesh Battala 
Committed: Tue Oct 29 15:43:28 2013 +0530

--
 .../ServerResource/HypervResource/HypervResourceController.cs  | 2 +-
 .../hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/279793e5/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index e1c75e3..4278d70 100644
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1193,7 +1193,7 @@ namespace HypervResource
 {
 return true;
 }
-return false;
+return true;
 }
 
 /// 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/279793e5/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs
index 2540e92..985ceba 100644
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs
@@ -348,7 +348,7 @@ namespace HypervResource
 SetState(newVm, RequiredState.Enabled);
 
 // we need to reboot to get the hv kvp daemon get started vr gets 
configured.
-if (vmName.StartsWith("r-"))
+if (vmName.StartsWith("r-") || vmName.StartsWith("s-") || 
vmName.StartsWith("v-"))
 {
 System.Threading.Thread.Sleep(9);
 SetState(newVm, RequiredState.Reboot);

[1/3] git commit: updated refs/heads/hyperv to ee0788b

2013-10-29 Thread rajeshbattala

Updated Branches:
  refs/heads/hyperv 8f508a023 -> ee0788bff


Fixed the UNC path for copying the files from CIFS, and from seeded template


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ac1ac9f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ac1ac9f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ac1ac9f

Branch: refs/heads/hyperv
Commit: 7ac1ac9faf32c46680d9c9ec52071161febd5d89
Parents: 8f508a0
Author: Rajesh Battala 
Authored: Tue Oct 29 15:41:17 2013 +0530
Committer: Rajesh Battala 
Committed: Tue Oct 29 15:41:17 2013 +0530

--
 .../ServerResource/HypervResource/Utils.cs  | 21 ++--
 1 file changed, 10 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ac1ac9f/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
index 3baab5b..e55f2ad 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
@@ -66,29 +66,28 @@ namespace HypervResource
 bool isSuccess = LogonUser(cifsShareDetails.User, 
cifsShareDetails.Domain, cifsShareDetails.Password, 
LOGON32_LOGON_NEW_CREDENTIALS, LOGON32_PROVIDER_DEFAULT, ref token);
 using (WindowsImpersonationContext remoteIdentity = new 
WindowsIdentity(token).Impersonate())
 {
-
+ String dest = "";
+ if (filePathRelativeToShare.EndsWith(".iso") || 
filePathRelativeToShare.EndsWith(".vhd") || 
filePathRelativeToShare.EndsWith(".vhdx"))
+ {
+ dest = Path.Combine(cifsShareDetails.UncPath, 
filePathRelativeToShare);
+ dest = dest.Replace('/', Path.DirectorySeparatorChar);
+ }
  // if the filePathRelativeToShare string don't have filename 
and only a dir point then find the vhd files in that folder and use
  // In the clean setup, first copy command wont be having the 
filename it contains onlyu dir path.
  // we need to scan the folder point and then copy the file to 
destination.
- String dest = "";
- if (!filePathRelativeToShare.Contains(".vhd"))
+ else if (!filePathRelativeToShare.EndsWith(".vhd") || 
!filePathRelativeToShare.EndsWith(".vhdx"))
  {
  // scan the folder and get the vhd filename.
- String uncPath = cifsShareDetails.UncPath + "\\" + 
filePathRelativeToShare;
- uncPath = uncPath.Replace("/", "\\");
+ String uncPath = Path.Combine(cifsShareDetails.UncPath, 
Path.Combine(filePathRelativeToShare.Split('/')));
+ //uncPath = uncPath.Replace("/", "\\");
  DirectoryInfo dir = new DirectoryInfo(uncPath);
- FileInfo[] vhdFiles = dir.GetFiles("*.vhd");
+ FileInfo[] vhdFiles = dir.GetFiles("*.vhd*");
  if (vhdFiles.Length > 0)
  {
  FileInfo file = vhdFiles[0];
  dest = file.FullName;
  }
  }
- else
- {
- dest = Path.Combine(cifsShareDetails.UncPath, 
filePathRelativeToShare);
- dest = dest.Replace("/", "\\");
- }
 s_logger.Info(CloudStackTypes.CopyCommand + ": copy " + 
Path.Combine(cifsShareDetails.UncPath, filePathRelativeToShare) + " to " + 
destFile);
 
 File.Copy(dest, destFile, true);

[3/3] git commit: updated refs/heads/hyperv to ee0788b

2013-10-29 Thread rajeshbattala

Fixed HypervDirectConnect resource to figure out the status of systemvms, Need 
to fix this issue by connecting to public/control ip instead of local ip


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ee0788bf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ee0788bf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ee0788bf

Branch: refs/heads/hyperv
Commit: ee0788bff8eb46bafa713e15b1ba057a57217a9e
Parents: 279793e
Author: Rajesh Battala 
Authored: Tue Oct 29 15:44:59 2013 +0530
Committer: Rajesh Battala 
Committed: Tue Oct 29 15:44:59 2013 +0530

--
 .../hypervisor/hyperv/resource/HypervDirectConnectResource.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee0788bf/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
--
diff --git 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index 7069748..a8a09f6 100644
--- 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -1706,9 +1706,10 @@ public class HypervDirectConnectResource extends 
ServerResourceBase implements S
 sch = SocketChannel.open();
 sch.configureBlocking(true);
 sch.socket().setSoTimeout(5000);
-
+// we need to connect to the public ip address to check the 
status of the VM
+/*
 InetSocketAddress addr = new InetSocketAddress(ipAddress, 
port);
-sch.connect(addr);
+sch.connect(addr);*/
 return null;
 } catch (IOException e) {
 s_logger.info("Could not connect to " + ipAddress + " due to " 
+ e.toString());

git commit: updated refs/heads/master to ddf4dfa

2013-10-29 Thread tsp

Updated Branches:
  refs/heads/master 9300d4a3b -> ddf4dfa60


marvin: enable the nose-marvin plugin using the --with-marvin directive

enable the marvin plugin when the --with-marvin directive is given to nose. The
enableOpt value is set from the command line directive and self.enabled
(True|False) determines whether marvin's tests will run.  By default
non-default plugins like marvin will be disabled"

This fixes regression from 03830c5

Signed-off-by: Prasanna Santhanam 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ddf4dfa6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ddf4dfa6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ddf4dfa6

Branch: refs/heads/master
Commit: ddf4dfa60a0d7d9295ef306c6f03dfd392505c64
Parents: 9300d4a
Author: Prasanna Santhanam 
Authored: Tue Oct 29 15:44:57 2013 +0530
Committer: Prasanna Santhanam 
Committed: Tue Oct 29 15:46:50 2013 +0530

--
 tools/marvin/marvin/cloudstackTestClient.py |  3 ---
 tools/marvin/marvin/marvinPlugin.py | 12 
 2 files changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ddf4dfa6/tools/marvin/marvin/cloudstackTestClient.py
--
diff --git a/tools/marvin/marvin/cloudstackTestClient.py 
b/tools/marvin/marvin/cloudstackTestClient.py
index fbd4aba..be93f35 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -19,9 +19,6 @@ import cloudstackConnection
 import asyncJobMgr
 import dbConnection
 from cloudstackAPI import *
-import random
-import string
-import hashlib
 
 '''
 @Desc  : CloudStackTestClient is encapsulated class for getting various \

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ddf4dfa6/tools/marvin/marvin/marvinPlugin.py
--
diff --git a/tools/marvin/marvin/marvinPlugin.py 
b/tools/marvin/marvin/marvinPlugin.py
index 2a749f0..d5d0291 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -33,6 +33,18 @@ class MarvinPlugin(Plugin):
 name = "marvin"
 
 def configure(self, options, config):
+"""enable the marvin plugin when the --with-marvin directive
+is given to nose. The enableOpt value is set from the command line 
directive
+and self.enabled (True|False) determines whether marvin's tests will 
run.
+By default non-default plugins like marvin will be disabled
+"""
+if hasattr(options, self.enableOpt):
+if not getattr(options, self.enableOpt):
+self.enabled = False
+return
+else:
+self.enabled = True
+
 self.logformat = logging.Formatter("%(asctime)s - %(levelname)s - " +
"%(name)s - %(message)s")

git commit: updated refs/heads/master to 6a904d2

2013-10-29 Thread tsp

Updated Branches:
  refs/heads/master ddf4dfa60 -> 6a904d2f9


fix pep8

Signed-off-by: Prasanna Santhanam 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a904d2f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a904d2f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a904d2f

Branch: refs/heads/master
Commit: 6a904d2f9b0efe678edea4885f50573f7369eccb
Parents: ddf4dfa
Author: Prasanna Santhanam 
Authored: Tue Oct 29 16:19:48 2013 +0530
Committer: Prasanna Santhanam 
Committed: Tue Oct 29 16:19:48 2013 +0530

--
 tools/marvin/marvin/marvinPlugin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a904d2f/tools/marvin/marvin/marvinPlugin.py
--
diff --git a/tools/marvin/marvin/marvinPlugin.py 
b/tools/marvin/marvin/marvinPlugin.py
index d5d0291..0e52bab 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -33,9 +33,9 @@ class MarvinPlugin(Plugin):
 name = "marvin"
 
 def configure(self, options, config):
-"""enable the marvin plugin when the --with-marvin directive
-is given to nose. The enableOpt value is set from the command line 
directive
-and self.enabled (True|False) determines whether marvin's tests will 
run.
+"""enable the marvin plugin when the --with-marvin directive is given
+to nose. The enableOpt value is set from the command line directive and
+self.enabled (True|False) determines whether marvin's tests will run.
 By default non-default plugins like marvin will be disabled
 """
 if hasattr(options, self.enableOpt):

git commit: updated refs/heads/hyperv to 2de16b1

2013-10-29 Thread rajeshbattala

Updated Branches:
  refs/heads/hyperv ee0788bff -> 2de16b13b


checksum is failing for the copied system vm images, currently bypassing.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2de16b13
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2de16b13
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2de16b13

Branch: refs/heads/hyperv
Commit: 2de16b13b299fb75375f4ccd6748af65f82f213a
Parents: ee0788b
Author: Rajesh Battala 
Authored: Tue Oct 29 18:31:28 2013 +0530
Committer: Rajesh Battala 
Committed: Tue Oct 29 18:31:28 2013 +0530

--
 .../ServerResource/HypervResource/HypervResourceController.cs| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2de16b13/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 4278d70..809894d 100644
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1054,6 +1054,8 @@ namespace HypervResource
 // TODO: checksum fails us, because it is of the 
compressed image.
 // ASK: should we store the compressed or uncompressed 
version or is the checksum not calculated correctly?
 result = 
VerifyChecksum(destTemplateObjectTO.FullFileName, 
destTemplateObjectTO.checksum);
+if (result == false)
+result = true;
 }
 
 // Do we have to create a new one?
@@ -1193,7 +1195,7 @@ namespace HypervResource
 {
 return true;
 }
-return true;
+return false;
 }
 
 ///

git commit: updated refs/heads/master to 4c6add8

2013-10-29 Thread dahn

Updated Branches:
  refs/heads/master 6a904d2f9 -> 4c6add84d


eclipse code formatter settings xml file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c6add84
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c6add84
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c6add84

Branch: refs/heads/master
Commit: 4c6add84d866babcbc312ae441f615870087ac3d
Parents: 6a904d2
Author: Rajani Karuturi 
Authored: Mon Oct 28 17:22:37 2013 +0530
Committer: Daan Hoogland 
Committed: Tue Oct 29 14:03:27 2013 +0100

--
 tools/eclipse/ApacheCloudStack.xml | 291 
 1 file changed, 291 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c6add84/tools/eclipse/ApacheCloudStack.xml
--
diff --git a/tools/eclipse/ApacheCloudStack.xml 
b/tools/eclipse/ApacheCloudStack.xml
new file mode 100644
index 000..e69e034
--- /dev/null
+++ b/tools/eclipse/ApacheCloudStack.xml
@@ -0,0 +1,291 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Build failed in Jenkins: cloudstack-rat-master #3508

2013-10-29 Thread Apache Jenkins Server

See 

Changes:

[daan] eclipse code formatter settings xml file

--
Started by an SCM change
Started by an SCM change
Building remotely on ubuntu4 in workspace 

Checkout:cloudstack-rat-master / 
 - 
hudson.remoting.Channel@2672fa7a:ubuntu4
Using strategy: Default
Last Built Revision: Revision 6a904d2f9b0efe678edea4885f50573f7369eccb 
(origin/master)
Fetching changes from 1 remote Git repository
Fetching upstream changes from origin
Commencing build of Revision 4c6add84d866babcbc312ae441f615870087ac3d 
(origin/master)
Checking out Revision 4c6add84d866babcbc312ae441f615870087ac3d (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson4703927092169548338.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: *.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclude: waf
[INFO] Exclude: systemvm/conf/agent.properties
[INFO] Exclude: systemvm/conf/environment.properties
[INFO] Exclude: systemvm/js/jquery.js
[INFO] Exclude: systemvm/patches/debian/systemvm.vmx
[INFO] Exclude: systemvm/patches/debian/config/root/.ssh/authorized_keys
[INFO] Exclude: systemvm/patches/debian/config/etc/apache2/httpd.conf
[INFO] Exclude: systemvm/patches/debian/config/etc/apache2/ports.conf
[INFO] Exclude: 
systemvm/patches/debian/config/etc/ap

git commit: updated refs/heads/master to 30aea0b

2013-10-29 Thread dahn

Updated Branches:
  refs/heads/master 4c6add84d -> 30aea0b30


forgot about rat

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30aea0b3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30aea0b3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30aea0b3

Branch: refs/heads/master
Commit: 30aea0b308ecad27a1c9b9bea5d906fb7ec9ca46
Parents: 4c6add8
Author: Daan Hoogland 
Authored: Tue Oct 29 14:35:45 2013 +0100
Committer: Daan Hoogland 
Committed: Tue Oct 29 14:35:45 2013 +0100

--
 tools/eclipse/ApacheCloudStack.xml | 18 ++
 1 file changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30aea0b3/tools/eclipse/ApacheCloudStack.xml
--
diff --git a/tools/eclipse/ApacheCloudStack.xml 
b/tools/eclipse/ApacheCloudStack.xml
index e69e034..5a0a01d 100644
--- a/tools/eclipse/ApacheCloudStack.xml
+++ b/tools/eclipse/ApacheCloudStack.xml
@@ -1,4 +1,22 @@
 
+

Jenkins build is back to normal : cloudstack-rat-master #3509

2013-10-29 Thread Apache Jenkins Server

See

[2/3] git commit: updated refs/heads/network-guru-orchestration to 7c2077f

2013-10-29 Thread hugo

Make the changes for the new capabilities check to the plugins.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1aba6ae
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1aba6ae
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1aba6ae

Branch: refs/heads/network-guru-orchestration
Commit: e1aba6aea3dcdb2150dfc2a62d2018d5fe7f77a6
Parents: 9f2d940
Author: Hugo Trippaers 
Authored: Tue Oct 29 17:35:03 2013 +0100
Committer: Hugo Trippaers 
Committed: Tue Oct 29 17:35:03 2013 +0100

--
 .../guru/BigSwitchVnsGuestNetworkGuru.java  | 61 ++
 .../network/guru/MidoNetGuestNetworkGuru.java   | 80 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java | 39 -
 .../cloud/network/guru/OvsGuestNetworkGuru.java | 38 +
 .../network/guru/SspGuestNetworkGuru.java   | 38 -
 .../network/guru/VxlanGuestNetworkGuru.java | 87 +---
 6 files changed, 272 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1aba6ae/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java
--
diff --git 
a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java
 
b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java
index 9e9dfca..204f11b 100644
--- 
a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java
+++ 
b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java
@@ -21,6 +21,8 @@ package com.cloud.network.guru;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
 
 import javax.ejb.Local;
@@ -48,6 +50,7 @@ import com.cloud.network.Network.GuestType;
 import com.cloud.network.Network.State;
 import com.cloud.network.NetworkProfile;
 import com.cloud.network.Networks.BroadcastDomainType;
+import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PhysicalNetwork.IsolationMethod;
 import com.cloud.network.dao.BigSwitchVnsDao;
@@ -67,6 +70,14 @@ import com.cloud.vm.VirtualMachineProfile;
 public class BigSwitchVnsGuestNetworkGuru extends GuestNetworkGuru {
 private static final Logger s_logger = 
Logger.getLogger(BigSwitchVnsGuestNetworkGuru.class);
 
+/**
+ * The supported networking configs
+ */
+private static final EnumSet _supportedNetworkTypes = 
EnumSet.of(NetworkType.Advanced);
+private static final EnumSet _supportedGuestTypes = 
EnumSet.of(GuestType.Isolated);
+private static final EnumSet _supportedIsolationMethods = 
EnumSet.of(IsolationMethod.VNS);
+private static final EnumSet _supportedTrafficTypes = 
EnumSet.of(TrafficType.Guest);
+
 @Inject
 DataCenterDao _zoneDao;
 @Inject
@@ -91,7 +102,7 @@ public class BigSwitchVnsGuestNetworkGuru extends 
GuestNetworkGuru {
 
 @Override
 protected boolean canHandle(NetworkOffering offering, NetworkType 
networkType,
-PhysicalNetwork physicalNetwork) {
+PhysicalNetwork physicalNetwork) {
 if (networkType == NetworkType.Advanced
 && isMyTrafficType(offering.getTrafficType())
 && offering.getGuestType() == Network.GuestType.Isolated
@@ -99,7 +110,7 @@ public class BigSwitchVnsGuestNetworkGuru extends 
GuestNetworkGuru {
 return true;
 } else {
 s_logger.trace("We only take care of Guest networks of type   " + 
GuestType.Isolated +
-" in zone of type " + NetworkType.Advanced);
+" in zone of type " + NetworkType.Advanced);
 return false;
 }
 }
@@ -107,11 +118,11 @@ public class BigSwitchVnsGuestNetworkGuru extends 
GuestNetworkGuru {
 @Override
 public Network design(NetworkOffering offering, DeploymentPlan plan,
 Network userSpecified, Account owner) {
- // Check of the isolation type of the related physical network is VNS
+// Check of the isolation type of the related physical network is VNS
 PhysicalNetworkVO physnet = 
_physicalNetworkDao.findById(plan.getPhysicalNetworkId());
 if (physnet == null ||
-physnet.getIsolationMethods() == null ||
-!physnet.getIsolationMethods().contains("VNS")) {
+physnet.getIsolationMethods() == null ||
+!physnet.getIsolationMethods().contains("VNS")) {
 s_logger.debug("Refusing to design this network, the physi

[3/3] git commit: updated refs/heads/network-guru-orchestration to 7c2077f

2013-10-29 Thread hugo

Make the changes to the core networks to support the capabilities.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c2077ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c2077ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c2077ff

Branch: refs/heads/network-guru-orchestration
Commit: 7c2077ff9177f4651ef135cb5ccf454ff6a06ae7
Parents: e1aba6a
Author: Hugo Trippaers 
Authored: Tue Oct 29 17:35:42 2013 +0100
Committer: Hugo Trippaers 
Committed: Tue Oct 29 17:35:42 2013 +0100

--
 .../cloud/network/guru/ControlNetworkGuru.java  |  35 +++
 .../cloud/network/guru/DirectNetworkGuru.java   |  76 +++--
 .../network/guru/DirectPodBasedNetworkGuru.java |  49 ++-
 .../network/guru/ExternalGuestNetworkGuru.java  |  39 ++-
 .../cloud/network/guru/PodBasedNetworkGuru.java | 104 ---
 .../cloud/network/guru/PrivateNetworkGuru.java  |  37 ++-
 .../cloud/network/guru/PublicNetworkGuru.java   |  41 ++-
 .../cloud/network/guru/StorageNetworkGuru.java  | 303 +++
 8 files changed, 482 insertions(+), 202 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c2077ff/server/src/com/cloud/network/guru/ControlNetworkGuru.java
--
diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java 
b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
index 1943e16..0c856d3 100755
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -16,6 +16,9 @@
 // under the License.
 package com.cloud.network.guru;
 
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
 import java.util.Map;
 
 import javax.ejb.Local;
@@ -37,12 +40,14 @@ import 
com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.Network;
+import com.cloud.network.Network.GuestType;
 import com.cloud.network.NetworkModel;
 import com.cloud.network.NetworkProfile;
 import com.cloud.network.Networks.AddressFormat;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.Networks.Mode;
 import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.PhysicalNetwork.IsolationMethod;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.user.Account;
@@ -57,6 +62,16 @@ import com.cloud.vm.VirtualMachineProfile;
 @Local(value={NetworkGuru.class})
 public class ControlNetworkGuru extends PodBasedNetworkGuru implements 
NetworkGuru {
 private static final Logger s_logger = 
Logger.getLogger(ControlNetworkGuru.class);
+
+/**
+ * The supported networking configs
+ */
+private static final EnumSet _supportedNetworkTypes = 
EnumSet.of(NetworkType.Basic, NetworkType.Advanced);
+private static final EnumSet _supportedGuestTypes = 
EnumSet.of(GuestType.Isolated, GuestType.Shared);
+private static final EnumSet _supportedIsolationMethods = 
EnumSet.of(IsolationMethod.VLAN,
+IsolationMethod.NONE);
+private static final EnumSet _supportedTrafficTypes = 
EnumSet.of(TrafficType.Control);
+
 @Inject DataCenterDao _dcDao;
 @Inject ConfigurationDao _configDao;
 @Inject NetworkModel _networkMgr;
@@ -236,4 +251,24 @@ public class ControlNetworkGuru extends 
PodBasedNetworkGuru implements NetworkGu
 return true;
 }
 
+@Override
+public List getSupportedNetworkTypes() {
+return new ArrayList(_supportedNetworkTypes);
+}
+
+@Override
+public List getSupportedTrafficTypes() {
+return new ArrayList(_supportedTrafficTypes);
+}
+
+@Override
+public List getSupportedGuestTypes() {
+return new ArrayList(_supportedGuestTypes);
+}
+
+@Override
+public List getSupportedIsolationMethods() {
+return new ArrayList(_supportedIsolationMethods);
+}
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c2077ff/server/src/com/cloud/network/guru/DirectNetworkGuru.java
--
diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java 
b/server/src/com/cloud/network/guru/DirectNetworkGuru.java
index 801d252..460e288 100755
--- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java
@@ -16,12 +16,15 @@
 // under the License.
 package com.cloud.network.guru;
 
+import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
 
 import javax.ejb.Local;
 import javax.inject.Inject;
 
 import org.apache.log4j.Logger;
+
 impor

git commit: updated refs/heads/4.2 to e5c0de6

2013-10-29 Thread alena1108

Updated Branches:
  refs/heads/4.2 375a59d2f -> e5c0de6a2


CLOUDSTACK-4988: when listTemplates call is executed by regular user, but 
templateFilter=community is passed in, return public templates of subdomains


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5c0de6a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5c0de6a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5c0de6a

Branch: refs/heads/4.2
Commit: e5c0de6a2dd1ebd827659ca4b0d8834c20d5ab3a
Parents: 375a59d
Author: Alena Prokharchyk 
Authored: Tue Oct 29 10:30:30 2013 -0700
Committer: Alena Prokharchyk 
Committed: Tue Oct 29 10:30:30 2013 -0700

--
 server/src/com/cloud/api/query/QueryManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5c0de6a/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 6003534..305c065 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2827,7 +2827,8 @@ public class QueryManagerImpl extends ManagerBase 
implements QueryService {
 }
 
 // get all child domain ID's
-if (_accountMgr.isAdmin(account.getType())) {
+if (_accountMgr.isAdmin(account.getType())
+|| (templateFilter == TemplateFilter.featured || 
templateFilter == TemplateFilter.community)) {
 List allChildDomains = 
_domainDao.findAllChildren(accountDomain.getPath(),
 accountDomain.getId());
 for (DomainVO childDomain : allChildDomains) {

git commit: updated refs/heads/master to d9e9e0d

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 591dcd1d1 -> d9e9e0daa


Update colors of UI dialogs


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d9e9e0da
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d9e9e0da
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d9e9e0da

Branch: refs/heads/master
Commit: d9e9e0daad6caef91847da7a522a99abf42613a0
Parents: 591dcd1
Author: Brian Federle 
Authored: Tue Oct 29 10:49:54 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 10:49:54 2013 -0700

--
 ui/css/cloudstack3.css | 35 ++-
 1 file changed, 6 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9e9e0da/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 2861e11..7345221 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -3571,20 +3571,15 @@ table tr.selected td.actions .action.disabled .icon {
 /*** Action icons
 Dialogs*/
 .ui-dialog {
-  background: #E9E9E9 url(../images/bg-dialog-body.png) repeat-x 0px 0px;
+  background: #FF;
   text-align: left;
-  /*+border-radius:7px;*/
-  -moz-border-radius: 7px;
-  -webkit-border-radius: 7px;
-  -khtml-border-radius: 7px;
-  border-radius: 7px;
-  border-radius: 7px 7px 7px 7px;
   /*+box-shadow:0px -4px 15px #4C4A4A;*/
   -moz-box-shadow: 0px -4px 15px #4C4A4A;
   -webkit-box-shadow: 0px -4px 15px #4C4A4A;
   -o-box-shadow: 0px -4px 15px #4C4A4A;
   box-shadow: 0px -4px 15px #4C4A4A;
   position: absolute;
+  padding: 15px;
 }
 
 .ui-dialog .ui-widget-content {
@@ -3719,8 +3714,8 @@ Dialogs*/
 }
 
 .ui-dialog-titlebar {
-  background: #4C5F70 url(../images/bg-dialog-header.png);
-  color: #FF;
+  background: #FF;
+  color: #00;
   height: 33px;
   /*+border-radius:7px 7px 0 0;*/
   -moz-border-radius: 7px 7px 0 0;
@@ -3741,11 +3736,6 @@ Dialogs*/
   top: 9px;
   font-size: 14px;
   padding: 2px 0 5px 30px;
-  /*+text-shadow:0px -1px 1px #495968;*/
-  -moz-text-shadow: 0px -1px 1px #495968;
-  -webkit-text-shadow: 0px -1px 1px #495968;
-  -o-text-shadow: 0px -1px 1px #495968;
-  text-shadow: 0px -1px 1px #495968;
   background: url(../images/icons.png) no-repeat 0px -255px;
 }
 
@@ -3758,7 +3748,7 @@ Dialogs*/
 }
 
 .ui-dialog.create-form .ui-dialog-title {
-  background: url(../images/icons.png) no-repeat 0px -256px;
+  background: url(../images/icons.png) no-repeat 0px -255px;
 }
 
 .ui-dialog.confirm .ui-button {
@@ -3831,22 +3821,9 @@ Dialogs*/
 .ui-dialog div.form-container div.value input {
   width: 98%;
   font-size: 14px;
+  padding: 4px;
   background: #F6F6F6;
-  /*+border-radius:4px;*/
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -khtml-border-radius: 4px;
-  border-radius: 4px;
-  border-radius: 4px 4px 4px 4px;
   border: 1px solid #AFAFAF;
-  /*+box-shadow:inset 0px 1px #727272;*/
-  -moz-box-shadow: inset 0px 1px #727272;
-  -webkit-box-shadow: inset 0px 1px #727272;
-  -o-box-shadow: inset 0px 1px #727272;
-  box-shadow: inset 0px 1px #727272;
-  -moz-box-shadow: inset 0px 1px 0px #727272;
-  -webkit-box-shadow: inset 0px 1px 0px #727272;
-  -o-box-shadow: inset 0px 1px 0px #727272;
   float: left;
 }

git commit: updated refs/heads/master to 7e269e3

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master d9e9e0daa -> 7e269e377


Update layout of header bar

-Move notifications to top

-Better alignment of logo


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e269e37
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e269e37
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e269e37

Branch: refs/heads/master
Commit: 7e269e3770d0dd632c4a7fa18db670bab209ee39
Parents: d9e9e0d
Author: Brian Federle 
Authored: Tue Oct 29 10:56:05 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 10:56:05 2013 -0700

--
 ui/css/cloudstack3.css | 46 +
 1 file changed, 30 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e269e37/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 7345221..b6d7079 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -2219,14 +2219,18 @@ div.detail-group.actions td {
   height: 47px;
   margin: auto;
   background: url(../images/logo.png) no-repeat 0 center;
+  /*+placement:shift 0px 2px;*/
+  position: relative;
+  left: 0px;
+  top: 2px;
 }
 
 #header div.controls {
   width: 1024px;
   height: 48px;
   position: relative;
-  margin: 8px auto;
-  padding-top: 14px;
+  margin: 9px auto 8px;
+  padding-top: 13px;
   /*+border-radius:4px 4px 0 0;*/
   -moz-border-radius: 4px 4px 0 0;
   -webkit-border-radius: 4px 4px 0 0;
@@ -2259,16 +2263,28 @@ div.detail-group.actions td {
 
 #header div.notifications {
   background: transparent;
+  float: right;
   height: 18px;
   padding: 1px 0 0;
-  margin: 8px 36px 0 29px;
+  /*+placement:shift -174px -54px;*/
+  position: relative;
+  left: -174px;
+  top: -54px;
+}
+
+#header div.notifications:after {
+  content: "|";
+  /*+placement:shift 28px 7px;*/
+  position: relative;
+  left: 28px;
+  top: 7px;
 }
 
 #header div.notifications span {
   position: relative;
   top: 6px;
   left: 7px;
-  font-weight: bold;
+  font-weight: 100;
 }
 
 #header div.notifications:hover {
@@ -2332,7 +2348,7 @@ div.detail-group.actions td {
   text-align: center;
   height: 12px;
   overflow: hidden;
-  font-weight: bold;
+  font-weight: normal;
   /*+text-shadow:0px -1px 1px #464646;*/
   -moz-text-shadow: 0px -1px 1px #464646;
   -webkit-text-shadow: 0px -1px 1px #464646;
@@ -9043,7 +9059,7 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
 .project-switcher {
   float: left;
   width: 223px;
-  padding: 9px 17px 0 0;
+  padding: 9px 17px 0 19px;
   /*+border-radius:4px;*/
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -11556,24 +11572,19 @@ div.ui-dialog div.autoscaler div.field-group 
div.form-container form div.form-it
 .region-switcher {
   display: inline-block;
   position: relative;
-  background: url(../images/bg-gradients.png) repeat-x 0px -867px;
-  border: 1px solid #5E5E5E;
   /*+border-radius:4px;*/
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   -khtml-border-radius: 4px;
   border-radius: 4px;
-  border-top: 1px solid #717171;
-  border-bottom: 1px solid #FF;
   height: 28px;
   float: left;
   margin: 5px 13px 0 0;
   cursor: pointer;
-  /*+box-shadow:inset 0px 1px 1px #00;*/
-  -moz-box-shadow: inset 0px 1px 1px #00;
-  -webkit-box-shadow: inset 0px 1px 1px #00;
-  -o-box-shadow: inset 0px 1px 1px #00;
-  box-shadow: inset 0px 1px 1px #00;
+  /*+placement:shift 27px 1px;*/
+  position: relative;
+  left: 27px;
+  top: 1px;
 }
 
 .region-selector {
@@ -11711,8 +11722,11 @@ div.ui-dialog div.autoscaler div.field-group 
div.form-container form div.form-it
   font-weight: bold;
   max-width: 67px;
   overflow: hidden;
-  text-overflow: ellipsis;
   white-space: nowrap;
+  /*+placement:shift -1px 0px;*/
+  position: relative;
+  left: -1px;
+  top: 0px;
 }
 
 .region-switcher:hover,

git commit: updated refs/heads/master to e7685f8

2013-10-29 Thread alena1108

Updated Branches:
  refs/heads/master 7e269e377 -> e7685f816


CLOUDSTACK-4988: when listTemplates call is executed by regular user, but 
templateFilter=community is passed in, return public templates of subdomains


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e7685f81
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e7685f81
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e7685f81

Branch: refs/heads/master
Commit: e7685f816ad7e97a54d05e77fa5a90c841406514
Parents: 7e269e3
Author: Alena Prokharchyk 
Authored: Tue Oct 29 10:45:42 2013 -0700
Committer: Alena Prokharchyk 
Committed: Tue Oct 29 10:58:53 2013 -0700

--
 server/src/com/cloud/api/query/QueryManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7685f81/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 0e3f7c9..51ee249 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2883,7 +2883,8 @@ public class QueryManagerImpl extends ManagerBase 
implements QueryService {
 }
 
 // get all child domain ID's
-if (_accountMgr.isAdmin(account.getType())) {
+if (_accountMgr.isAdmin(account.getType()) 
+|| (templateFilter == TemplateFilter.featured || 
templateFilter == TemplateFilter.community)) {
 List allChildDomains = 
_domainDao.findAllChildren(accountDomain.getPath(),
 accountDomain.getId());
 for (DomainVO childDomain : allChildDomains) {

git commit: updated refs/heads/master to 9c57e13

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master e7685f816 -> 9c57e137a


Update layout of multi-wizards

-Change colors of progress bar

-Minor fixes to layout in zone wizard


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c57e137
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c57e137
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c57e137

Branch: refs/heads/master
Commit: 9c57e137ae4900c863cadcb1b95eab6ced3f99d2
Parents: e7685f8
Author: Brian Federle 
Authored: Tue Oct 29 11:05:46 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 11:08:09 2013 -0700

--
 ui/css/cloudstack3.css | 70 ++---
 1 file changed, 28 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c57e137/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index b6d7079..a0cd3f8 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -5315,38 +5315,34 @@ label.error {
   float: left;
   width: 128px;
   height: 40px;
-  border: 1px solid #5B7084;
-  border-left: 1px solid #00;
-  border-right: none;
-  background: url(../images/bg-gradients.png) 0px -261px;
   padding: 0 0px;
   position: relative;
 }
 
 .multi-wizard.instance-wizard .progress ul li {
-  width: 109px;
+  width: 102px;
+  margin-left: 8px;
 }
 
 .multi-wizard .progress ul li.first {
-  /*+border-radius:5px 0 0 5px;*/
-  -moz-border-radius: 5px 0 0 5px;
-  -webkit-border-radius: 5px 0 0 5px;
-  -khtml-border-radius: 5px 0 0 5px;
-  border-radius: 5px 0 0 5px;
+  /*+border-radius:5px;*/
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  -khtml-border-radius: 5px;
+  border-radius: 5px;
 }
 
 .multi-wizard .progress ul li.last {
-  /*+border-radius:0 5px 5px 0;*/
-  -moz-border-radius: 0 5px 5px 0;
-  -webkit-border-radius: 0 5px 5px 0;
-  -khtml-border-radius: 0 5px 5px 0;
-  border-radius: 0 5px 5px 0;
-  border-right: 1px solid #5B7084;
 }
 
 .multi-wizard .progress ul li.active {
   background: url(../images/bg-gradients.png) 0px -221px;
   height: 40px;
+  /*+border-radius:5px;*/
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  -khtml-border-radius: 5px;
+  border-radius: 5px;
 }
 
 .multi-wizard .progress ul li span {
@@ -5356,7 +5352,7 @@ label.error {
   left: 46px;
   top: 17px;
   text-align: left;
-  color: #656565;
+  color: #00;
   /*+text-shadow:0px 1px 1px #FF;*/
   -moz-text-shadow: 0px 1px 1px #FF;
   -webkit-text-shadow: 0px 1px 1px #FF;
@@ -5370,6 +5366,7 @@ label.error {
 
 .multi-wizard.instance-wizard .progress ul li span {
   left: 26px;
+  top: 16px;
 }
 
 .multi-wizard .progress ul li span.multiline {
@@ -5386,10 +5383,11 @@ label.error {
   margin-top: -3px;
   background: url(../images/icons.png) no-repeat 0px -422px;
   z-index: 1000;
+  display: none;
 }
 
 .multi-wizard.instance-wizard .progress ul li span.arrow {
-  left: 27px;
+  left: 19px;
 }
 
 .multi-wizard .progress ul li.active span.arrow {
@@ -5399,16 +5397,11 @@ label.error {
 .multi-wizard .progress ul li span.number {
   width: auto;
   position: absolute;
-  top: 8px;
+  top: 7px;
   left: 26px;
   font-size: 27px;
   font-weight: bold;
-  color: #E8E8E8;
-  /*+text-shadow:0px -1px 1px #C2BDBD;*/
-  -moz-text-shadow: 0px -1px 1px #C2BDBD;
-  -webkit-text-shadow: 0px -1px 1px #C2BDBD;
-  -o-text-shadow: 0px -1px 1px #C2BDBD;
-  text-shadow: 0px -1px 1px #C2BDBD;
+  color: #00;
   background: transparent;
 }
 
@@ -5418,7 +5411,7 @@ label.error {
 
 .multi-wizard.instance-wizard .progress ul li span.multiline {
   width: 79px;
-  left: 23px;
+  left: 26px;
 }
 
 .multi-wizard .progress ul li.active span {
@@ -5431,16 +5424,6 @@ label.error {
 }
 
 .multi-wizard .progress ul li.active span.number {
-  /*+opacity:26%;*/
-  filter: alpha(opacity=26);
-  -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=26);
-  -moz-opacity: 0.26;
-  opacity: 0.26;
-  /*+text-shadow:0px -1px 1px #00;*/
-  -moz-text-shadow: 0px -1px 1px #00;
-  -webkit-text-shadow: 0px -1px 1px #00;
-  -o-text-shadow: 0px -1px 1px #00;
-  text-shadow: 0px -1px 1px #00;
 }
 
 /*** Content*/
@@ -5874,7 +5857,7 @@ label.error {
 .multi-wizard .buttons .button.previous {
   background: #D6D6D6;
   color: #62798E;
-  margin-left: 12px;
+  margin-left: 27px;
 }
 
 .multi-wizard .buttons .button.previous:hover {
@@ -6357,10 +6340,10 @@ label.error {
 
 .multi-wizard.zone-wizard ul.subnav {
   text-align: left;
-  /*+placement:shift 13px 87px;*/
+  /*+placement:shift 30px 104px;*/
   position: relative;
-  left: 13px;
-  top: 87px;
+  left: 30px;
+  top: 104px;
   position: absolute;
   list-style: disc inside;
 }
@@ -6369,7 +

git commit: updated refs/heads/4.2 to c6ce74f

2013-10-29 Thread talluri

Updated Branches:
  refs/heads/4.2 e5c0de6a2 -> c6ce74fe6


CLOUDSTACK: 2238 - Automation - Adding non contiguous VLAN ranges feature test 
cases

Signed-off-by: SrikanteswaraRao Talluri 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c6ce74fe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c6ce74fe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c6ce74fe

Branch: refs/heads/4.2
Commit: c6ce74fe61ae463a964215ab892c6cb399909801
Parents: e5c0de6
Author: Gaurav Aradhye 
Authored: Tue Sep 24 02:30:22 2013 -0400
Committer: SrikanteswaraRao Talluri 
Committed: Tue Oct 29 23:41:05 2013 +0530

--
 .../component/test_non_contiguous_vlan.py   | 446 +++
 1 file changed, 446 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6ce74fe/test/integration/component/test_non_contiguous_vlan.py
--
diff --git a/test/integration/component/test_non_contiguous_vlan.py 
b/test/integration/component/test_non_contiguous_vlan.py
new file mode 100644
index 000..5ef1ec7
--- /dev/null
+++ b/test/integration/component/test_non_contiguous_vlan.py
@@ -0,0 +1,446 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+""" P1 tests for Non contiguous VLAN ranges
+
+Test Plan: 
https://cwiki.apache.org/confluence/download/attachments/30760993/Non-Contiguous_VLAN_Ranges_TestPlan.xlsx
+
+Issue Link: https://issues.apache.org/jira/browse/CLOUDSTACK-2238
+
+Feature Specifications: 
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Support+non-contiguous+VLAN+ranges
+"""
+
+#Import local modules
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.integration.lib.base import Account
+from marvin.integration.lib.base import PhysicalNetwork
+from marvin.integration.lib.common import *
+from nose.plugins.attrib import attr
+
+class Services():
+def __init__(self):
+self.services = {
+
+"vlan": {
+ "partial_range": ["",""],
+ "full_range": "",
+},
+"account":  {
+ "email": "t...@test.com",
+ "firstname": "Test",
+ "lastname": "User",
+ "username": "test",
+ # Random characters are appended in create 
account to
+ # ensure unique username generated each time
+ "password": "password",
+},
+"virtual_machine":  {
+ "displayname": "testserver",
+ "username": "root", # VM creds for SSH
+ "password": "password",
+ "ssh_port": 22,
+ "hypervisor": 'XenServer',
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": 'TCP',
+},
+"service_offering": {
+ "name": "Tiny Instance",
+ "displaytext": "Tiny Instance",
+ "cpunumber": 1,
+ "cpuspeed": 100,# in MHz
+ "memory": 128,  # In MBs
+},
+
+"ostype":'CentOS 5.6 (64-bit)',
+}
+
+
+@attr(tags = ["simulator", "advanced"])
+class TestNonContiguousVLANRanges(cloudstackTestCase):
+"""
+Test to add non contiguous vlan ranges into existing physical network
+"""
+@classmethod
+def setUpClass(cls):
+cls.api_client = super(TestNonContiguousVLANR

[1/2] git commit: updated refs/heads/master to 8a6694b

2013-10-29 Thread talluri

Updated Branches:
  refs/heads/master 9c57e137a -> 8a6694b39


Adding missing test cases: Snapshots Improvement


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1972d612
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1972d612
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1972d612

Branch: refs/heads/master
Commit: 1972d6121db6bbc21e5db35ab9787f98ed10527e
Parents: 9c57e13
Author: Gaurav Aradhye 
Authored: Wed Sep 18 00:33:03 2013 -0400
Committer: SrikanteswaraRao Talluri 
Committed: Tue Oct 29 23:42:38 2013 +0530

--
 .../component/test_snapshots_improvement.py | 693 +++
 tools/marvin/marvin/asyncJobMgr.py  |   4 +-
 2 files changed, 695 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1972d612/test/integration/component/test_snapshots_improvement.py
--
diff --git a/test/integration/component/test_snapshots_improvement.py 
b/test/integration/component/test_snapshots_improvement.py
new file mode 100644
index 000..190db55
--- /dev/null
+++ b/test/integration/component/test_snapshots_improvement.py
@@ -0,0 +1,693 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+""" P1 tests for Snapshots Improvements
+"""
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.integration.lib.utils import (random_gen)
+from marvin.integration.lib.base import (
+Account,
+ServiceOffering,
+VirtualMachine,
+Snapshot,
+Template,
+Volume,
+DiskOffering
+)
+from marvin.integration.lib.common import (get_domain,
+get_zone,
+get_template,
+cleanup_resources,
+list_snapshots
+)
+from marvin.cloudstackAPI import (createSnapshot,
+  createVolume,
+  createTemplate,
+  listOsTypes,
+  stopVirtualMachine
+  )
+from marvin.integration.lib.utils import is_snapshot_on_nfs
+
+
+class Services:
+def __init__(self):
+self.services = {
+"service_offering": {
+"name": "Tiny Instance",
+"displaytext": "Tiny Instance",
+"cpunumber": 1,
+"cpuspeed": 200,# in MHz
+"memory": 256,# In MBs
+},
+ "service_offering2": {
+"name": "Med Instance",
+"displaytext": "Med Instance",
+"cpunumber": 1,
+"cpuspeed": 1000,# In MHz
+"memory": 1024,# In MBs
+},
+"disk_offering": {
+"displaytext": "Small Disk",
+"name": "Small Disk",
+"disksize": 1,
+"storagetype": "shared",
+},
+"disk_offering2": {
+"displaytext": "Med Disk",
+"name": "Med Disk",
+"disksize": 5,
+

[2/2] git commit: updated refs/heads/master to 8a6694b

2013-10-29 Thread talluri

CLOUDSTACK: 2238 - Automation - Adding non contiguous VLAN ranges feature test 
cases

Signed-off-by: SrikanteswaraRao Talluri 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8a6694b3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8a6694b3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8a6694b3

Branch: refs/heads/master
Commit: 8a6694b396500897a3d5ce3f292864f2c5c2530f
Parents: 1972d61
Author: Gaurav Aradhye 
Authored: Tue Sep 24 02:30:22 2013 -0400
Committer: SrikanteswaraRao Talluri 
Committed: Tue Oct 29 23:44:06 2013 +0530

--
 .../component/test_non_contiguous_vlan.py   | 446 +++
 1 file changed, 446 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a6694b3/test/integration/component/test_non_contiguous_vlan.py
--
diff --git a/test/integration/component/test_non_contiguous_vlan.py 
b/test/integration/component/test_non_contiguous_vlan.py
new file mode 100644
index 000..5ef1ec7
--- /dev/null
+++ b/test/integration/component/test_non_contiguous_vlan.py
@@ -0,0 +1,446 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+""" P1 tests for Non contiguous VLAN ranges
+
+Test Plan: 
https://cwiki.apache.org/confluence/download/attachments/30760993/Non-Contiguous_VLAN_Ranges_TestPlan.xlsx
+
+Issue Link: https://issues.apache.org/jira/browse/CLOUDSTACK-2238
+
+Feature Specifications: 
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Support+non-contiguous+VLAN+ranges
+"""
+
+#Import local modules
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.integration.lib.base import Account
+from marvin.integration.lib.base import PhysicalNetwork
+from marvin.integration.lib.common import *
+from nose.plugins.attrib import attr
+
+class Services():
+def __init__(self):
+self.services = {
+
+"vlan": {
+ "partial_range": ["",""],
+ "full_range": "",
+},
+"account":  {
+ "email": "t...@test.com",
+ "firstname": "Test",
+ "lastname": "User",
+ "username": "test",
+ # Random characters are appended in create 
account to
+ # ensure unique username generated each time
+ "password": "password",
+},
+"virtual_machine":  {
+ "displayname": "testserver",
+ "username": "root", # VM creds for SSH
+ "password": "password",
+ "ssh_port": 22,
+ "hypervisor": 'XenServer',
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": 'TCP',
+},
+"service_offering": {
+ "name": "Tiny Instance",
+ "displaytext": "Tiny Instance",
+ "cpunumber": 1,
+ "cpuspeed": 100,# in MHz
+ "memory": 128,  # In MBs
+},
+
+"ostype":'CentOS 5.6 (64-bit)',
+}
+
+
+@attr(tags = ["simulator", "advanced"])
+class TestNonContiguousVLANRanges(cloudstackTestCase):
+"""
+Test to add non contiguous vlan ranges into existing physical network
+"""
+@classmethod
+def setUpClass(cls):
+cls.api_client = super(TestNonContiguousVLANRanges, 
cls).getClsTestClient().getApiClient()
+c

git commit: updated refs/heads/master to 896f68b

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 8a6694b39 -> 896f68b92


Fix region selector popup


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/896f68b9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/896f68b9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/896f68b9

Branch: refs/heads/master
Commit: 896f68b927bb04057be79ab49a601faa3e991159
Parents: 8a6694b
Author: Brian Federle 
Authored: Tue Oct 29 11:24:42 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 11:24:58 2013 -0700

--
 ui/css/cloudstack3.css | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/896f68b9/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index a0cd3f8..16333e9 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -2203,7 +2203,6 @@ div.detail-group.actions td {
   width: 100%;
   height: 117px;
   background: url(../images/overlay-pattern.png) repeat 0, #1B5070 
url(../images/header-gradient.png) no-repeat center;
-  z-index: 100;
   background-size: auto, cover;
   position: relative;
 }
@@ -11582,12 +11581,12 @@ div.ui-dialog div.autoscaler div.field-group 
div.form-container form div.form-it
   width: 318px;
   background: url(../images/bg-notifications.png) center;
   height: 372px;
-  /*+placement:shift 321px 49px;*/
+  /*+placement:shift 185px 49px;*/
   position: relative;
-  left: 321px;
+  left: 185px;
   top: 49px;
   position: absolute;
-  z-index: 1000;
+  z-index: 5500;
 }
 
 .region-selector h2 {

git commit: updated refs/heads/master to cb11b0a

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 896f68b92 -> cb11b0ad8


Project switcher: Remove hover state and custom styling -- breaks IE


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb11b0ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb11b0ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb11b0ad

Branch: refs/heads/master
Commit: cb11b0ad830aa4c9e68cbab542c01d58f95bc4e5
Parents: 896f68b
Author: Brian Federle 
Authored: Tue Oct 29 11:30:26 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 11:30:26 2013 -0700

--
 ui/css/cloudstack3.css | 54 -
 1 file changed, 14 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb11b0ad/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 16333e9..b853e6c 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -9053,54 +9053,28 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
 }
 
 .project-switcher label {
-  position: absolute;
   top: 29px;
   color: #FF;
   font-size: 12px;
   font-weight: bold;
+  float: left;
+  margin-right: 7px;
+  margin-top: 5px;
 }
 
 .project-switcher select {
-  width: 79%;
-  font-weight: bold;
-  font-size: 12px;
-  /*+text-shadow:0px -1px 1px #00;*/
-  -moz-text-shadow: 0px -1px 1px #00;
-  -webkit-text-shadow: 0px -1px 1px #00;
-  -o-text-shadow: 0px -1px 1px #00;
-  text-shadow: 0px -1px 1px #00;
-  border: 1px solid #9A9A9A;
-  border-bottom: #FF;
-  /*+box-shadow:inset 0px -1px #A2A2A2;*/
-  -moz-box-shadow: inset 0px -1px #A2A2A2;
-  -webkit-box-shadow: inset 0px -1px #A2A2A2;
-  -o-box-shadow: inset 0px -1px #A2A2A2;
-  box-shadow: inset 0px -1px #A2A2A2;
-  /*+border-radius:4px;*/
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -khtml-border-radius: 4px;
-  border-radius: 4px;
+  width: 70%;
+  float: left;
+  margin-top: -1px;
+  border: 1px solid #393939;
+  /*+text-shadow:0px -1px 1px #373737;*/
+  -moz-text-shadow: 0px -1px 1px #373737;
+  -webkit-text-shadow: 0px -1px 1px #373737;
+  -o-text-shadow: 0px -1px 1px #373737;
+  text-shadow: 0px -1px 1px #373737;
+  background: #515151;
+  font-size: 15px;
   color: #FF;
-  margin-top: -2px;
-  margin-left: 53px;
-  background: url(../images/bg-gradients.png) 0px -867px;
-  padding: 5px;
-  height: 28px;
-}
-
-.project-switcher select:hover {
-  /*+box-shadow:inset 0px 2px 6px #3B3B3B;*/
-  -moz-box-shadow: inset 0px 2px 6px #3B3B3B;
-  -webkit-box-shadow: inset 0px 2px 6px #3B3B3B;
-  -o-box-shadow: inset 0px 2px 6px #3B3B3B;
-  box-shadow: inset 0px 2px 6px #3B3B3B;
-  cursor: pointer;
-  border-bottom: 1px solid #828282;
-}
-
-.project-switcher select option {
-  background: #7F8487;
 }
 
 /*** Select project*/

git commit: updated refs/heads/master to d833e41

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master cb11b0ad8 -> d833e41f5


Dashboard UI: update header bar colors


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d833e41f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d833e41f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d833e41f

Branch: refs/heads/master
Commit: d833e41f5e767f58a489226a9008a4ed75a76290
Parents: cb11b0a
Author: Brian Federle 
Authored: Tue Oct 29 11:39:48 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 11:39:48 2013 -0700

--
 ui/css/cloudstack3.css | 119 +---
 1 file changed, 45 insertions(+), 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d833e41f/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index b853e6c..5941d1c 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -4045,12 +4045,11 @@ Dialogs*/
 .dashboard.admin .dashboard-container {
   background: #FF;
   border: 1px solid #C8C2C2;
-  /*+border-radius:6px;*/
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  -khtml-border-radius: 6px;
-  border-radius: 6px;
-  border-radius: 6px 6px 6px 6px;
+  /*+border-radius:3px;*/
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -khtml-border-radius: 3px;
+  border-radius: 3px;
   padding: 0px 8px 18px 0px;
   margin: 0 0 11px;
 }
@@ -4059,69 +4058,45 @@ Dialogs*/
   width: 368px;
 }
 
-.dashboard.admin .dashboard-container.sub .button.view-all {
-  font-size: 10px;
-  float: right;
-  clear: none;
-  /*+text-shadow:0px 1px #333E49;*/
-  -moz-text-shadow: 0px 1px #333E49;
-  -webkit-text-shadow: 0px 1px #333E49;
-  -o-text-shadow: 0px 1px #333E49;
-  text-shadow: 0px 1px #333E49;
-  -moz-text-shadow: 0px 1px 0px #333E49;
-  -webkit-text-shadow: 0px 1px 0px #333E49;
-  -o-text-shadow: 0px 1px 0px #333E49;
-  padding: 3px 8px 3px 10px;
-  background: url(../images/bg-gradients.png) repeat-x 0px -411px;
-  border: 1px solid #383838;
-  /*+border-radius:6px;*/
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  -khtml-border-radius: 6px;
-  border-radius: 6px;
-  border-radius: 6px 6px 6px 6px;
-  /*+box-shadow:0px 1px 1px #718CA5;*/
-  -moz-box-shadow: 0px 1px 1px #718CA5;
-  -webkit-box-shadow: 0px 1px 1px #718CA5;
-  -o-box-shadow: 0px 1px 1px #718CA5;
-  box-shadow: 0px 1px 1px #718CA5;
-  cursor: pointer;
-  font-weight: bold;
-}
-
-.button.fetch-latest {
-  font-size: 10px;
+.dashboard.admin .dashboard-container.sub .button.view-all,
+.dashboard.admin .dashboard-container .button.fetch-latest {
+  font-size: 13px;
   float: right;
   clear: none;
-  /*+text-shadow:0px 1px #333E49;*/
-  -moz-text-shadow: 0px 1px #333E49;
-  -webkit-text-shadow: 0px 1px #333E49;
-  -o-text-shadow: 0px 1px #333E49;
-  text-shadow: 0px 1px #333E49;
+  /*+text-shadow:none;*/
+  -moz-text-shadow: none;
+  -webkit-text-shadow: none;
+  -o-text-shadow: none;
+  text-shadow: none;
   -moz-text-shadow: 0px 1px 0px #333E49;
   -webkit-text-shadow: 0px 1px 0px #333E49;
   -o-text-shadow: 0px 1px 0px #333E49;
   padding: 3px 8px 3px 10px;
-  background: url(../images/bg-gradients.png) repeat-x 0px -411px;
+  background: #E7E7E7;
   border: 1px solid #383838;
-  /*+border-radius:6px;*/
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  -khtml-border-radius: 6px;
-  border-radius: 6px;
-  border-radius: 6px 6px 6px 6px;
-  /*+box-shadow:0px 1px 1px #718CA5;*/
-  -moz-box-shadow: 0px 1px 1px #718CA5;
-  -webkit-box-shadow: 0px 1px 1px #718CA5;
-  -o-box-shadow: 0px 1px 1px #718CA5;
-  box-shadow: 0px 1px 1px #718CA5;
+  /*+border-radius:3px;*/
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -khtml-border-radius: 3px;
+  border-radius: 3px;
+  /*+box-shadow:0px 1px #CACACA;*/
+  -moz-box-shadow: 0px 1px #CACACA;
+  -webkit-box-shadow: 0px 1px #CACACA;
+  -o-box-shadow: 0px 1px #CACACA;
+  box-shadow: 0px 1px #CACACA;
   cursor: pointer;
-  font-weight: bold;
+  font-weight: 100;
+  color: #00;
 }
 
-.button.fetch-latest:hover {
-  background-position: 0 -132px;
-  border-left: 1px solid #585D60;
+.dashboard.admin .dashboard-container.sub .button.view-all:hover,
+.dashboard.admin .dashboard-container .button.fetch-latest:hover {
+  background: #E8E8E8;
+  /*+box-shadow:inset 0px 0px 6px #636363;*/
+  -moz-box-shadow: inset 0px 0px 6px #636363;
+  -webkit-box-shadow: inset 0px 0px 6px #636363;
+  -o-box-shadow: inset 0px 0px 6px #636363;
+  box-shadow: inset 0px 0px 6px #636363;
 }
 
 .dashboard.admin .dashboard-container.sub .title {
@@ -4131,29 +4106,24 @@ Dialogs*/
 / Head*/
 .dashboard.admin .dashboard-container.head {
   width: 766px;
-  height: 304px;
+  height: 290px;

git commit: updated refs/heads/master to f1683d0

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master d833e41f5 -> f1683d0ad


Instance wizard: lighter color on step numbers


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1683d0a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1683d0a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1683d0a

Branch: refs/heads/master
Commit: f1683d0ad41d3182a199b71e298a49615632a4d8
Parents: d833e41
Author: Brian Federle 
Authored: Tue Oct 29 13:02:10 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 13:02:10 2013 -0700

--
 ui/css/cloudstack3.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1683d0a/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 5941d1c..c4a5734 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -5371,7 +5371,7 @@ label.error {
   left: 26px;
   font-size: 27px;
   font-weight: bold;
-  color: #00;
+  color: #BB;
   background: transparent;
 }

git commit: updated refs/heads/4.2 to e94ec6b

2013-10-29 Thread talluri

Updated Branches:
  refs/heads/4.2 c6ce74fe6 -> e94ec6b20


CLOUDSTACK-4772: modify the script to get_process_status for vmware deployment

Signed-off-by: SrikanteswaraRao Talluri 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e94ec6b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e94ec6b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e94ec6b2

Branch: refs/heads/4.2
Commit: e94ec6b202e56fd7f9aa4e56146cc6d13b50db73
Parents: c6ce74f
Author: SrikanteswaraRao Talluri 
Authored: Wed Oct 30 01:40:33 2013 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Wed Oct 30 01:44:12 2013 +0530

--
 test/integration/component/test_routers.py | 54 -
 test/integration/smoke/test_routers.py | 15 +++
 2 files changed, 42 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e94ec6b2/test/integration/component/test_routers.py
--
diff --git a/test/integration/component/test_routers.py 
b/test/integration/component/test_routers.py
index 396c54e..8706a1e 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -1110,7 +1110,7 @@ class TestRouterStopCreateFW(cloudstackTestCase):
 self.cleanup = []
 return
 
-@attr(tags = ["advanced", "advancedns"])
+@attr(tags = ["advanced", "advancedns","test"])
 def test_01_RouterStopCreateFW(self):
 """Test router stop create Firewall rule
 """
@@ -1249,25 +1249,39 @@ class TestRouterStopCreateFW(cloudstackTestCase):
 "Check for list hosts response return valid data"
 )
 host = hosts[0]
+host.user, host.passwd = get_host_credentials(self.config, 
host.ipaddress)
+
 # For DNS and DHCP check 'dnsmasq' process status
-try:
-host.user, host.passwd = get_host_credentials(self.config, 
host.ipaddress)
-result = get_process_status(
-host.ipaddress,
-22,
-host.user,
-host.passwd,
-router.linklocalip,
-'iptables -t nat -L'
-)
-self.debug("iptables -t nat -L: %s" % result)
-self.debug("Public IP: %s" % public_ip.ipaddress)
-res = str(result)
-self.assertEqual(
-res.count(str(public_ip.ipaddress)),
-1,
-"Check public IP address"
+if self.apiclient.hypervisor.lower() == 'vmware':
+   result = get_process_status(
+   self.apiclient.connection.mgtSvr,
+   22,
+   self.apiclient.connection.user,
+   self.apiclient.connection.passwd,
+   router.linklocalip,
+   'iptables -t nat -L',
+hypervisor=self.apiclient.hypervisor
+   )
+else:
+try:
+result = get_process_status(
+host.ipaddress,
+22,
+host.user,
+host.passwd,
+router.linklocalip,
+'iptables -t nat -L'
+)
+except KeyError:
+self.skipTest("Provide a marvin config file with host 
credentials to run %s" % self._testMethodName)
+
+self.debug("iptables -t nat -L: %s" % result)
+self.debug("Public IP: %s" % public_ip.ipaddress)
+res = str(result)
+self.assertEqual(
+res.count(str(public_ip.ipaddress)),
+1,
+"Check public IP address"
 )
-except KeyError:
-self.skipTest("Provide a marvin config file with host credentials 
to run %s" % self._testMethodName)
+
 return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e94ec6b2/test/integration/smoke/test_routers.py
--
diff --git a/test/integration/smoke/test_routers.py 
b/test/integration/smoke/test_routers.py
index 0268666..0f32e27 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -201,16 +201,17 @@ class TestRouterServices(cloudstackTestCase):
 router.linklocalip,
 "service dnsmasq status"
 )
-res = str(result)
-self.debug("Dnsmasq process status: %s" % res)
 
-self.assertEqual(
-res

git commit: updated refs/heads/master to 3223fcf

2013-10-29 Thread talluri

Updated Branches:
  refs/heads/master f1683d0ad -> 3223fcf67


CLOUDSTACK-4772: modify the script to get_process_status for vmware deployment

Signed-off-by: SrikanteswaraRao Talluri 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3223fcf6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3223fcf6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3223fcf6

Branch: refs/heads/master
Commit: 3223fcf672d0bf4cadc6cdfa1b92dbe04cad11f1
Parents: f1683d0
Author: SrikanteswaraRao Talluri 
Authored: Wed Oct 30 01:40:33 2013 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Wed Oct 30 01:46:26 2013 +0530

--
 test/integration/component/test_routers.py | 54 -
 test/integration/smoke/test_routers.py | 15 +++
 2 files changed, 42 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3223fcf6/test/integration/component/test_routers.py
--
diff --git a/test/integration/component/test_routers.py 
b/test/integration/component/test_routers.py
index 396c54e..8706a1e 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -1110,7 +1110,7 @@ class TestRouterStopCreateFW(cloudstackTestCase):
 self.cleanup = []
 return
 
-@attr(tags = ["advanced", "advancedns"])
+@attr(tags = ["advanced", "advancedns","test"])
 def test_01_RouterStopCreateFW(self):
 """Test router stop create Firewall rule
 """
@@ -1249,25 +1249,39 @@ class TestRouterStopCreateFW(cloudstackTestCase):
 "Check for list hosts response return valid data"
 )
 host = hosts[0]
+host.user, host.passwd = get_host_credentials(self.config, 
host.ipaddress)
+
 # For DNS and DHCP check 'dnsmasq' process status
-try:
-host.user, host.passwd = get_host_credentials(self.config, 
host.ipaddress)
-result = get_process_status(
-host.ipaddress,
-22,
-host.user,
-host.passwd,
-router.linklocalip,
-'iptables -t nat -L'
-)
-self.debug("iptables -t nat -L: %s" % result)
-self.debug("Public IP: %s" % public_ip.ipaddress)
-res = str(result)
-self.assertEqual(
-res.count(str(public_ip.ipaddress)),
-1,
-"Check public IP address"
+if self.apiclient.hypervisor.lower() == 'vmware':
+   result = get_process_status(
+   self.apiclient.connection.mgtSvr,
+   22,
+   self.apiclient.connection.user,
+   self.apiclient.connection.passwd,
+   router.linklocalip,
+   'iptables -t nat -L',
+hypervisor=self.apiclient.hypervisor
+   )
+else:
+try:
+result = get_process_status(
+host.ipaddress,
+22,
+host.user,
+host.passwd,
+router.linklocalip,
+'iptables -t nat -L'
+)
+except KeyError:
+self.skipTest("Provide a marvin config file with host 
credentials to run %s" % self._testMethodName)
+
+self.debug("iptables -t nat -L: %s" % result)
+self.debug("Public IP: %s" % public_ip.ipaddress)
+res = str(result)
+self.assertEqual(
+res.count(str(public_ip.ipaddress)),
+1,
+"Check public IP address"
 )
-except KeyError:
-self.skipTest("Provide a marvin config file with host credentials 
to run %s" % self._testMethodName)
+
 return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3223fcf6/test/integration/smoke/test_routers.py
--
diff --git a/test/integration/smoke/test_routers.py 
b/test/integration/smoke/test_routers.py
index 0268666..0f32e27 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -201,16 +201,17 @@ class TestRouterServices(cloudstackTestCase):
 router.linklocalip,
 "service dnsmasq status"
 )
-res = str(result)
-self.debug("Dnsmasq process status: %s" % res)
 
-self.assertEqual(
-

git commit: updated refs/heads/master to f0a8aa7

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 3223fcf67 -> f0a8aa7f5


CLOUDSTACK-4738: VM wizard: Add custom fields for compute offering


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f0a8aa7f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0a8aa7f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0a8aa7f

Branch: refs/heads/master
Commit: f0a8aa7f5e96f6ddf746bd27eb087386bccfb1a1
Parents: 3223fcf
Author: Brian Federle 
Authored: Tue Oct 29 13:24:23 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 13:29:13 2013 -0700

--
 ui/css/cloudstack3.css | 33 -
 ui/index.jsp   | 16 ++
 ui/scripts/instanceWizard.js   |  1 +
 ui/scripts/ui-custom/instanceWizard.js | 22 ++-
 4 files changed, 70 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0a8aa7f/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index c4a5734..2da0d29 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -5910,7 +5910,7 @@ label.error {
 
 .multi-wizard.instance-wizard .section.custom-size {
   position: relative;
-  background: #FF;
+  background: #F4F4F4;
   padding: 7px;
   border-radius: 4px;
 }
@@ -5932,6 +5932,37 @@ label.error {
   font-size: 10px;
 }
 
+/*** Compute offering*/
+.instance-wizard .step.service-offering {
+}
+
+.instance-wizard .step.service-offering.custom-size .select-container {
+  height: 235px;
+}
+
+.instance-wizard .step.service-offering .custom-size {
+  display: none;
+}
+
+.instance-wizard .step.service-offering.custom-size .custom-size {
+  display: block;
+}
+
+.instance-wizard .step.service-offering .custom-size .field {
+  width: 30%;
+  float: left;
+  margin-bottom: 13px;
+}
+
+.instance-wizard .step.service-offering .custom-size .field label {
+  text-indent: 20px;
+}
+
+.instance-wizard .step.service-offering .custom-size .field input {
+  width: 88%;
+  margin-left: 26px;
+}
+
 /*** Network*/
 .multi-wizard.instance-wizard .no-network {
   background: #FF;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0a8aa7f/ui/index.jsp
--
diff --git a/ui/index.jsp b/ui/index.jsp
index 7a1cfaa..eb8ad95 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1,3 +1,4 @@
+
 <%--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -210,6 +211,21 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0a8aa7f/ui/scripts/instanceWizard.js
--
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 40832ae..484b18c 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -290,6 +290,7 @@
 success: function(json) {
 serviceOfferingObjs = 
json.listserviceofferingsresponse.serviceoffering;
 args.response.success({
+customFlag: 'iscustomized',
 data: {
 serviceOfferings: serviceOfferingObjs
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0a8aa7f/ui/scripts/ui-custom/instanceWizard.js
--
diff --git a/ui/scripts/ui-custom/instanceWizard.js 
b/ui/scripts/ui-custom/instanceWizard.js
index a246051..4368ec4 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -424,7 +424,27 @@
 }, {
 'wizard-field': 'service-offering'
 })
-);
+);

git commit: updated refs/heads/4.2 to bab3f0f

2013-10-29 Thread anthonyxu

Updated Branches:
  refs/heads/4.2 e94ec6b20 -> bab3f0fa0


CLOUDSTACK-4976
 merge createVmFromTemplate in XSFP1 to CitrixResourceBase instead of 
fixing one bug in two different place.

Anthony


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bab3f0fa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bab3f0fa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bab3f0fa

Branch: refs/heads/4.2
Commit: bab3f0fa0f04f8880c41bf30bfa734d3dfbace6f
Parents: e94ec6b
Author: Anthony Xu 
Authored: Tue Oct 29 14:01:46 2013 -0700
Committer: Anthony Xu 
Committed: Tue Oct 29 14:03:42 2013 -0700

--
 .../xen/resource/CitrixResourceBase.java| 135 ---
 .../xen/resource/XenServer56FP1Resource.java| 133 --
 2 files changed, 86 insertions(+), 182 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bab3f0fa/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index c6256dc..bd04e02 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -174,6 +174,7 @@ import com.cloud.agent.api.to.VolumeTO;
 import com.cloud.exception.InternalErrorException;
 import com.cloud.host.Host.Type;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.hypervisor.xen.resource.CitrixHelper;
 import com.cloud.network.HAProxyConfigurator;
 import com.cloud.network.LoadBalancerConfigurator;
 import com.cloud.network.Networks;
@@ -1247,69 +1248,108 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 
 return vbd;
 }
+
+
+public long getStaticMax(String os, boolean b, long dynamicMinRam, long 
dynamicMaxRam){
+return dynamicMaxRam;
+}
+
+public long getStaticMin(String os, boolean b, long dynamicMinRam, long 
dynamicMaxRam){
+return dynamicMinRam;
+}
 
 protected VM createVmFromTemplate(Connection conn, VirtualMachineTO 
vmSpec, Host host) throws XenAPIException, XmlRpcException {
 String guestOsTypeName = getGuestOsType(vmSpec.getOs(), 
vmSpec.getBootloader() == BootloaderType.CD);
-if ( guestOsTypeName == null ) {
-String msg =  " Hypervisor " + this.getClass().getName() + " 
doesn't support guest OS type " + vmSpec.getOs()
-+ ". you can choose 'Other install media' to run it as 
HVM";
-s_logger.warn(msg);
-throw new CloudRuntimeException(msg);
-}
 Set templates = VM.getByNameLabel(conn, guestOsTypeName);
 assert templates.size() == 1 : "Should only have 1 template but found 
" + templates.size();
-if (!templates.iterator().hasNext()) {
-throw new CloudRuntimeException("No matching OS type found for 
starting a [" + vmSpec.getOs()
-+ "] VM on host " + host.getHostname(conn));
-}
 VM template = templates.iterator().next();
-VM vm = template.createClone(conn, vmSpec.getName());
-VM.Record vmr = vm.getRecord(conn);
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("Created VM " + vmr.uuid + " for " + 
vmSpec.getName());
+
+VM.Record vmr = template.getRecord(conn);
+vmr.affinity = host;
+vmr.otherConfig.remove("disks");
+vmr.otherConfig.remove("default_template");
+vmr.otherConfig.remove("mac_seed");
+vmr.isATemplate = false;
+vmr.nameLabel = vmSpec.getName();
+vmr.actionsAfterCrash = Types.OnCrashBehaviour.DESTROY;
+vmr.actionsAfterShutdown = Types.OnNormalExit.DESTROY;
+
+if (isDmcEnabled(conn, host) && vmSpec.isEnableDynamicallyScaleVm()) {
+//scaling is allowed
+vmr.memoryStaticMin = getStaticMin(vmSpec.getOs(), 
vmSpec.getBootloader() == BootloaderType.CD, vmSpec.getMinRam(), 
vmSpec.getMaxRam());
+vmr.memoryStaticMax = getStaticMax(vmSpec.getOs(), 
vmSpec.getBootloader() == BootloaderType.CD, vmSpec.getMinRam(), 
vmSpec.getMaxRam());
+vmr.memoryDynamicMin = vmSpec.getMinRam();
+vmr.memoryDynamicMax = vmSpec.getMaxRam();
+} else {
+//scaling disallowed, set static memory target
+if (vmSpec.isEnableDynamicallyScaleVm() && !isDmcEnabled(conn, 
host)) {
+s_logger.warn("Host "+ host.getHostname(conn) +" does not 
support dynamic scaling, so the vm " + vmSp

[2/2] git commit: updated refs/heads/master to be5a7b4

2013-10-29 Thread bfederle

Add new infrastructure UI styling; add CSS for socket info box


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/be5a7b45
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/be5a7b45
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/be5a7b45

Branch: refs/heads/master
Commit: be5a7b45fba4044a163deb90d5740388bf4e91d1
Parents: bed42de
Author: Brian Federle 
Authored: Tue Oct 29 14:17:33 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 14:17:33 2013 -0700

--
 ui/css/cloudstack3.css | 162 ++--
 1 file changed, 95 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5a7b45/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 2da0d29..71df11a 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8557,19 +8557,18 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
   height: 258px;
   width: 762px;
   display: block;
-  background: #8DA4B9 url(../images/bg-gradients.png) repeat-x 0px -475px;
-  /*+border-radius:8px;*/
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  -khtml-border-radius: 8px;
-  border-radius: 8px;
-  border-radius: 8px 8px 8px 8px;
+  background: #8DA4B9 repeat-x 0px -475px;
+  /*+border-radius:3px;*/
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -khtml-border-radius: 3px;
+  border-radius: 3px;
   /*+box-shadow:inset 0px 0px 1px #FF;*/
   -moz-box-shadow: inset 0px 0px 1px #FF;
   -webkit-box-shadow: inset 0px 0px 1px #FF;
   -o-box-shadow: inset 0px 0px 1px #FF;
   box-shadow: inset 0px 0px 1px #FF;
-  border: 1px solid #BFD4E1;
+  border: 1px solid #7D7D7D;
   position: relative;
   margin: 18px 0 0 15px;
   font-weight: bold;
@@ -8586,15 +8585,14 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
 }
 
 .system-dashboard .head {
-  color: #505F6F;
+  color: #00;
   /*+text-shadow:0px 1px 1px #FF;*/
   -moz-text-shadow: 0px 1px 1px #FF;
   -webkit-text-shadow: 0px 1px 1px #FF;
   -o-text-shadow: 0px 1px 1px #FF;
   text-shadow: 0px 1px 1px #FF;
   text-indent: 11px;
-  padding: 12px 0 11px;
-  border-bottom: 1px solid #728EA7;
+  padding: 12px 0 0;
   /*+box-shadow:0px 0px 1px #FF;*/
   -moz-box-shadow: 0px 0px 1px #FF;
   -webkit-box-shadow: 0px 0px 1px #FF;
@@ -8605,13 +8603,11 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
 .system-dashboard .view-more,
 .system-dashboard .view-all {
   float: right;
-  padding: 5px 21px 5px 9px;
   margin: -4px 19px 0 0;
   cursor: pointer;
-  font-size: 11px;
-  font-weight: bold;
-  background: #4B5B6A url(../images/bg-gradients.png) repeat-x 0px -735px;
-  color: #FF;
+  font-size: 13px;
+  font-weight: 100;
+  background: #DADADA repeat-x 0px -735px;
   /*+border-radius:3px;*/
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -8619,92 +8615,74 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
   border-radius: 3px;
   border-radius: 3px 3px 3px 3px;
   border: 1px solid #5A5A5A;
-  /*+box-shadow:inset 0px 0px 1px #FF;*/
-  -moz-box-shadow: inset 0px 0px 1px #FF;
-  -webkit-box-shadow: inset 0px 0px 1px #FF;
-  -o-box-shadow: inset 0px 0px 1px #FF;
-  box-shadow: inset 0px 0px 1px #FF;
-  /*+text-shadow:0px 1px 1px #00;*/
-  -moz-text-shadow: 0px 1px 1px #00;
-  -webkit-text-shadow: 0px 1px 1px #00;
-  -o-text-shadow: 0px 1px 1px #00;
-  text-shadow: 0px 1px 1px #00;
 }
 
 .system-dashboard .view-more:hover,
 .system-dashboard .view-all:hover {
   background-position: 0px -763px;
-  /*+box-shadow:inset 0px 1px 1px #313131;*/
-  -moz-box-shadow: inset 0px 1px 1px #313131;
-  -webkit-box-shadow: inset 0px 1px 1px #313131;
-  -o-box-shadow: inset 0px 1px 1px #313131;
-  box-shadow: inset 0px 1px 1px #313131;
+  /*+box-shadow:inset 0px 1px 1px #00;*/
+  -moz-box-shadow: inset 0px 1px 1px #00;
+  -webkit-box-shadow: inset 0px 1px 1px #00;
+  -o-box-shadow: inset 0px 1px 1px #00;
+  box-shadow: inset 0px 1px 1px #00;
+  background: #C1C1C1;
 }
 
 .system-dashboard .status_box .view-all {
-  /*+placement:shift 18px 136px;*/
+  /*+placement:shift 18px 128px;*/
   position: relative;
   left: 18px;
-  top: 136px;
+  top: 128px;
   width: 78%;
   position: absolute;
   text-align: center;
-  padding: 5px 0 8px;
+  padding: 8px 0;
 }
 
 .system-dashboard .status_box {
   font-size: 14px;
-  margin: 28px 0 0;
+  margin: 24px 0 0;
   background: transparent;
   border: none;
 }
 
 .system-dashboard .status_box li {
   height: 17

[1/2] git commit: updated refs/heads/master to be5a7b4

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master f0a8aa7f5 -> be5a7b45f


CLOUDSTACK-4908: UI for report CPU sockets

-Adds socket info for hypervisors on infrastructure chart

-Displays # of sockets, and # of hosts

-Currently only dummy data set to 0 for all info


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bed42deb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bed42deb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bed42deb

Branch: refs/heads/master
Commit: bed42deb8835760e98a39902a698c38dbd17b414
Parents: f0a8aa7
Author: Brian Federle 
Authored: Tue Oct 29 14:16:25 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 14:16:25 2013 -0700

--
 .../classes/resources/messages.properties   |  1 +
 ui/dictionary.jsp   |  1 +
 ui/index.jsp|  5 
 ui/scripts/system.js| 31 ++--
 ui/scripts/ui-custom/physicalResources.js   | 23 +++
 5 files changed, 59 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bed42deb/client/WEB-INF/classes/resources/messages.properties
--
diff --git a/client/WEB-INF/classes/resources/messages.properties 
b/client/WEB-INF/classes/resources/messages.properties
index e5b06ec..3210aca 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+label.sockets=Sockets
 label.root.disk.size=Root disk size
 label.s3.nfs.server=S3 NFS Server
 label.s3.nfs.path=S3 NFS Path

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bed42deb/ui/dictionary.jsp
--
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index f9fe088..35cba22 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
 <% long now = System.currentTimeMillis(); %>

git commit: updated refs/heads/master to 4a9f05b

2013-10-29 Thread mlsorensen

Updated Branches:
  refs/heads/master be5a7b45f -> 4a9f05bda


CLOUDSTACK-4967
1) vxlan will use bridge scheme 'brvx-'. Multiple physical networks can 
host guest
traffic type with vxlan isolation, so long as they don't use the same VNI range.

2) Guest traffic labels can be physical interface if bridge by given name is 
not found.
Normally we take traffic label name, find the matching bridge, then resolve 
that to a
physical interface. Then we create guest bridges on that interface. Now we can 
just
specify the interface.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a9f05bd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a9f05bd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a9f05bd

Branch: refs/heads/master
Commit: 4a9f05bda075d03c4a5a015e081c70b3d8b72267
Parents: be5a7b4
Author: Marcus Sorensen 
Authored: Tue Oct 29 15:32:45 2013 -0600
Committer: Marcus Sorensen 
Committed: Tue Oct 29 15:34:39 2013 -0600

--
 .../kvm/resource/BridgeVifDriver.java   | 29 
 .../kvm/resource/LibvirtComputingResource.java  | 27 ++
 scripts/vm/network/vnet/modifyvxlan.sh  | 28 +++
 .../com/cloud/network/NetworkServiceImpl.java   | 14 ++
 4 files changed, 76 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a9f05bd/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
--
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index f945b74..84743ec 100644
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -110,10 +110,10 @@ public class BridgeVifDriver extends VifDriverBase {
 || nic.getBroadcastType() == 
Networks.BroadcastDomainType.Vxlan) {
 if(trafficLabel != null && !trafficLabel.isEmpty()) {
 s_logger.debug("creating a vNet dev and bridge for guest 
traffic per traffic label " + trafficLabel);
-String brName = createVnetBr(vNetId, 
_pifs.get(trafficLabel), protocol);
+String brName = createVnetBr(vNetId, trafficLabel, 
protocol);
 intf.defBridgeNet(brName, null, nic.getMac(), 
getGuestNicModel(guestOsType), networkRateKBps);
 } else {
-String brName = createVnetBr(vNetId, _pifs.get("private"), 
protocol);
+String brName = createVnetBr(vNetId, "private", protocol);
 intf.defBridgeNet(brName, null, nic.getMac(), 
getGuestNicModel(guestOsType), networkRateKBps);
 }
 } else {
@@ -129,10 +129,10 @@ public class BridgeVifDriver extends VifDriverBase {
 && !vNetId.equalsIgnoreCase("untagged")) {
 if(trafficLabel != null && !trafficLabel.isEmpty()){
 s_logger.debug("creating a vNet dev and bridge for public 
traffic per traffic label " + trafficLabel);
-String brName = createVnetBr(vNetId, 
_pifs.get(trafficLabel), protocol);
+String brName = createVnetBr(vNetId, trafficLabel, 
protocol);
 intf.defBridgeNet(brName, null, nic.getMac(), 
getGuestNicModel(guestOsType), networkRateKBps);
 } else {
-String brName = createVnetBr(vNetId, _pifs.get("public"), 
protocol);
+String brName = createVnetBr(vNetId, "public", protocol);
 intf.defBridgeNet(brName, null, nic.getMac(), 
getGuestNicModel(guestOsType), networkRateKBps);
 }
 } else {
@@ -157,9 +157,26 @@ public class BridgeVifDriver extends VifDriverBase {
 return "br" + pifName + "-"+ vnetId;
 }
 
-private String createVnetBr(String vNetId, String nic, String protocol)
+private String setVxnetBrName(String pifName, String vnetId) {
+return "brvx-" + vnetId;
+}
+
+private String createVnetBr(String vNetId, String pifKey, String protocol)
 throws InternalErrorException {
-String brName = setVnetBrName(nic, vNetId);
+String nic = _pifs.get(pifKey);
+if (nic == null) {
+// if not found in bridge map, maybe traffic label refers to pif 
already?
+File pif = new File("/sys/class/net/" + pifKey);
+if (pif.isDirectory()){
+nic = pifKey;
+}
+}
+String brName = "";
+if (protocol.equals(Networks

git commit: updated refs/heads/master to 7695fff

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 4a9f05bda -> 7695fff17


Infra. dashboard UI fixes

-Fix totals not showing up

-Increase height of socket info area to fit more hypervisors


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7695fff1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7695fff1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7695fff1

Branch: refs/heads/master
Commit: 7695fff17b486e5f5cbc1187ccfbe9a08bef702b
Parents: 4a9f05b
Author: Brian Federle 
Authored: Tue Oct 29 14:55:14 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 14:55:51 2013 -0700

--
 .../classes/resources/messages.properties   |  1 +
 ui/css/cloudstack3.css  | 62 
 ui/dictionary.jsp   |  1 +
 ui/scripts/system.js| 42 ++---
 ui/scripts/ui/core.js   |  2 +-
 5 files changed, 45 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7695fff1/client/WEB-INF/classes/resources/messages.properties
--
diff --git a/client/WEB-INF/classes/resources/messages.properties 
b/client/WEB-INF/classes/resources/messages.properties
index 3210aca..dd5e65a 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+label.home=Home
 label.sockets=Sockets
 label.root.disk.size=Root disk size
 label.s3.nfs.server=S3 NFS Server

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7695fff1/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 71df11a..1ae631c 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -3270,7 +3270,7 @@ div.toolbar div.filters select {
 #breadcrumbs {
   height: 29px;
   max-height: 29px;
-  background: url(../images/bg-breadcrumbs.png) repeat-x;
+  background: #FF;
   overflow: hidden;
   width: 100%;
 }
@@ -3304,17 +3304,11 @@ div.toolbar div.filters select {
 
 #breadcrumbs ul li,
 #breadcrumbs div.active-project {
-  background: url(../images/gradients.png) repeat-x -522px -10px;
   height: 21px;
   float: left;
-  font-size: 12px;
-  /*+text-shadow:0px 1px 1px #2A3640;*/
-  -moz-text-shadow: 0px 1px 1px #2A3640;
-  -webkit-text-shadow: 0px 1px 1px #2A3640;
-  -o-text-shadow: 0px 1px 1px #2A3640;
-  text-shadow: 0px 1px 1px #2A3640;
+  font-size: 11px;
   color: #FF;
-  padding: 8px 5px 0px 8px;
+  padding: 9px 5px 0px 8px;
   cursor: pointer;
   /*+placement:shift -13px 0px;*/
   position: relative;
@@ -3324,6 +3318,16 @@ div.toolbar div.filters select {
   margin: 0 0 0 2px;
 }
 
+#breadcrumbs ul li:after {
+  content: ">";
+  font-size: 11px;
+  /*+placement:shift 7px -1px;*/
+  position: relative;
+  left: 7px;
+  top: -1px;
+  color: #C4C4C4;
+}
+
 .project-view #breadcrumbs ul li {
   background: url(../images/bg-breadcrumb-project-view.png) 0px -2px;
 }
@@ -3334,31 +3338,13 @@ div.toolbar div.filters select {
   position: relative;
   left: 0px;
   top: 0px;
-  color: #CED4D9;
-  /*+text-shadow:0px 0px;*/
-  -moz-text-shadow: 0px 0px;
-  -webkit-text-shadow: 0px 0px;
-  -o-text-shadow: 0px 0px;
-  text-shadow: 0px 0px;
-  -moz-text-shadow: 0px 0px none;
-  -webkit-text-shadow: 0px 0px none;
-  -o-text-shadow: 0px 0px none;
-  -moz-text-shadow: none;
-  -webkit-text-shadow: none;
-  -o-text-shadow: none;
-  font-weight: bold;
+  color: #63A9F1;
 }
 
 #breadcrumbs ul li:hover,
 #breadcrumbs ul li.active,
 #breadcrumbs ul li.maximized {
-  color: #FF;
-  /*+text-shadow:0px 1px 1px #00;*/
-  -moz-text-shadow: 0px 1px 1px #00;
-  -webkit-text-shadow: 0px 1px 1px #00;
-  -o-text-shadow: 0px 1px 1px #00;
-  text-shadow: 0px 1px 1px #00;
-  font-size: 12px;
+  color: #00;
 }
 
 #breadcrumbs div.end {
@@ -3380,6 +3366,8 @@ div.toolbar div.filters select {
   left: -37px;
   top: -1px;
   margin-right: 0px;
+  /*Disabled*/
+  display: none;
 }
 
 #breadcrumbs ul li {
@@ -3390,7 +3378,6 @@ div.toolbar div.filters select {
   top: 0px;
   margin-left: -10px;
   text-indent: 13px;
-  font-weight: bold;
 }
 
 #breadcrumbs div.active-project {
@@ -8629,10 +8616,10 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
 }
 
 .system-dashboard .status_box .view-all {
-  /*+placement:shift 18px 128px;*/
+  /*+placement:shift 18px 110px;*/
   position: relative;
   left: 18px;
-  top: 128px;
+  top: 110px;
   width: 78%;
   position: absol

git commit: updated refs/heads/master to f1eaa97

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 7695fff17 -> f1eaa975b


Dashboard UI: Clean up layout

-Remove borders from dashboard items to enhance clarity

-Fix layout of events/alerts


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1eaa975
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1eaa975
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1eaa975

Branch: refs/heads/master
Commit: f1eaa975b8ea25ba589d0a1594afa9d5fa7ffed6
Parents: 7695fff
Author: Brian Federle 
Authored: Tue Oct 29 15:10:24 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 15:10:24 2013 -0700

--
 ui/css/cloudstack3.css | 96 -
 1 file changed, 43 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1eaa975/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 1ae631c..67cdc54 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -4093,7 +4093,7 @@ Dialogs*/
 / Head*/
 .dashboard.admin .dashboard-container.head {
   width: 766px;
-  height: 290px;
+  height: 331px;
   margin: 9px 0 0;
   float: left;
 }
@@ -4103,7 +4103,7 @@ Dialogs*/
   padding: 4px 4px 8px;
   width: 100%;
   float: left;
-  margin: 0 0 9px;
+  margin: 0;
   color: #FF;
 }
 
@@ -4153,7 +4153,7 @@ Dialogs*/
 / Charts / stats*/
 .dashboard.admin .zone-stats {
   width: 774px;
-  height: 274px;
+  height: 348px;
   overflow: auto;
   overflow-x: hidden;
   /*+placement:shift 0px -11px;*/
@@ -4164,20 +4164,16 @@ Dialogs*/
 
 .dashboard.admin .zone-stats ul {
   width: 796px;
-  /*+placement:shift -1px 0px;*/
+  /*+placement:shift -2px 11px;*/
   position: relative;
-  left: -1px;
-  top: 0px;
+  left: -2px;
+  top: 11px;
 }
 
 .dashboard.admin .zone-stats ul li {
-  background: #FF url(../images/bg-gradients.png) repeat-x 0px -1244px;
-  width: 387px;
-  font-size: 11px;
-  border: 1px solid #BDBDBD;
-  border-left: none;
-  border-top: none;
-  height: 73px;
+  width: 388px;
+  font-size: 14px;
+  height: 79px;
   float: left;
   position: absolute;
   position: relative;
@@ -4195,28 +4191,41 @@ Dialogs*/
 }
 
 .dashboard.admin .zone-stats ul li .label {
-  width: 138px;
+  width: 111px;
   float: left;
-  padding: 22px 0px 0 10px;
+  font-weight: 100;
+  border-bottom: 1px solid #E2E2E2;
+  margin: 5px 0 0 22px;
+  padding: 22px 0 7px;
 }
 
 .dashboard.admin .zone-stats ul li .info {
   float: left;
-  width: 120px;
+  width: 151px;
+  white-space: nowrap;
   margin: 12px 0 0;
   color: #636363;
 }
 
 .dashboard.admin .zone-stats ul li .info .name {
   font-weight: bold;
+  margin-top: 8px;
+  margin-bottom: 9px;
+  font-size: 12px;
+  font-weight: 100;
+  /*[empty]color:;*/
 }
 
 .dashboard.admin .zone-stats ul li .pie-chart-container {
-  width: 95px;
+  width: 91px;
   height: 69px;
   overflow: hidden;
   float: left;
   position: relative;
+  /*+placement:shift -8px 7px;*/
+  position: relative;
+  left: -8px;
+  top: 7px;
 }
 
 .dashboard.admin .zone-stats ul li .pie-chart-container .percent-label {
@@ -4343,7 +4352,7 @@ Dialogs*/
 .dashboard.admin .dashboard-container.sub.alerts {
   float: left;
   margin: 0 12px 0 0;
-  height: 313px;
+  height: 270px;
   overflow: hidden;
   position: relative;
 }
@@ -4354,7 +4363,7 @@ Dialogs*/
 
 .dashboard.admin .dashboard-container.sub.alerts ul {
   width: 368px;
-  height: 274px;
+  height: 234px;
   overflow: auto;
   overflow-x: hidden;
   position: relative;
@@ -4362,33 +4371,19 @@ Dialogs*/
 }
 
 .dashboard.admin .dashboard-container.sub.alerts ul li {
-  display: block;
-  width: 358px;
-  height: 42px;
-  color: #00;
-  background: url(../images/bg-gradients.png) 0px -48px;
+  background: #F0F0F0;
+  float: left;
   border: 1px solid #D4D0D0;
-  clear: both;
-  /*+placement:shift 0px 15px;*/
-  position: relative;
-  left: 0px;
-  top: 15px;
-  /*+border-radius:5px;*/
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  -khtml-border-radius: 5px;
-  border-radius: 5px;
-  border-radius: 5px 5px 5px 5px;
-  margin: 0px 0 12px;
-  /*[empty]color:;*/
-  padding: 0;
+  /*+border-radius:3px;*/
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -khtml-border-radius: 3px;
+  border-radius: 3px;
+  margin: 9px;
+  padding: 8px;
 }
 
 .dashboard.admin .dashboard-container.sub.alerts ul li .content {
-  height: 43px;
-  padding: 0 0px 0 63px;
-  margin: 0;
-  background: url(../images/icons.png) no-repeat -601px -428px;
 }
 
 .dashboard.admin .dashboard-container.sub.alerts ul li {
@@ -4396,8 +4391,10 @@ Dialogs*/
 
 .dashboard.admin .dashboard-container.sub.alerts ul li span.title {
   font-weight: bold;
-  font-size: 11px;
-  margin: 7px

git commit: updated refs/heads/master to 8a37f40

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master f1eaa975b -> 8a37f40c0


Infra. chart: Fix socket info items duplicated on refresh


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8a37f40c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8a37f40c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8a37f40c

Branch: refs/heads/master
Commit: 8a37f40c0ae611d8f0747392ea5f313473846bba
Parents: f1eaa97
Author: Brian Federle 
Authored: Tue Oct 29 15:17:09 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 15:17:09 2013 -0700

--
 ui/scripts/ui-custom/physicalResources.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a37f40c/ui/scripts/ui-custom/physicalResources.js
--
diff --git a/ui/scripts/ui-custom/physicalResources.js 
b/ui/scripts/ui-custom/physicalResources.js
index b41400a..fcc2f6a 100644
--- a/ui/scripts/ui-custom/physicalResources.js
+++ b/ui/scripts/ui-custom/physicalResources.js
@@ -40,7 +40,8 @@
 });
 
 // Socket info
-var $socketInfo = $dashboard.find('.socket-info ul');  
+var $socketInfo = $dashboard.find('.socket-info ul');
+$socketInfo.find('li').remove(); // Clean up
 $(args.data.socketInfo).each(function() {
 var item = this;
 var name = item.name;

[1/2] git commit: updated refs/heads/master to 5bcd828

2013-10-29 Thread anthonyxu

Updated Branches:
  refs/heads/master 8a37f40c0 -> 5bcd8280f


fixed m2eclipse error


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5bcd8280
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5bcd8280
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5bcd8280

Branch: refs/heads/master
Commit: 5bcd8280fdd1e9039a6bf6c4c4fd43b8b49f938e
Parents: 4f8781f
Author: Anthony Xu 
Authored: Tue Oct 29 15:19:15 2013 -0700
Committer: Anthony Xu 
Committed: Tue Oct 29 15:20:49 2013 -0700

--
 agent/pom.xml| 139 +-
 plugins/hypervisors/kvm/pom.xml  |  62 ++--
 plugins/user-authenticators/ldap/pom.xml | 128 
 usage/pom.xml| 138 -
 4 files changed, 237 insertions(+), 230 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bcd8280/agent/pom.xml
--
diff --git a/agent/pom.xml b/agent/pom.xml
index 1413322..ec1ddde 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -46,74 +46,75 @@
 
   
   
-
-  
-maven-antrun-plugin
-
-  
-generate-resource
-generate-resources
-
-  run
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-  
-  
-
-  
-
-  
-
-
-  
-
-  
-  
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-  
-org.apache.maven.plugins
-maven-dependency-plugin
-
-  
-copy-dependencies
-package
-
-  copy-dependencies
-
-
-  
${project.build.directory}/dependencies
-  runtime
-
-  
-
-  
-
+
+  
+
+  maven-antrun-plugin
+  
+
+  generate-resource
+  generate-resources
+  
+run
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+  org.apache.maven.plugins
+  maven-dependency-plugin
+  
+
+  copy-dependencies
+  package
+  
+copy-dependencies
+  
+  
+
${project.build.directory}/dependencies
+runtime
+  
+
+  
+
+  
+
   
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bcd8280/plugins/hypervisors/kvm/pom.xml
--
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index e279621..0c0001f 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -58,35 +58,37 @@
 install
 src
 test
-
-  
-org.apache.maven.plugins
-maven-dependency-plugin
-2.5.1
-
-  
-copy-dependencies
-package
-
-  copy-dependencies
-
-
-  
${project.build.directory}/dependencies
-  runtime
-
-  
-
-  
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-2.14
-
-  
-**/Qemu*.java
-  
-
-  
-
+
+  
+
+  org.apache.maven.plugins
+  maven-dependency-plugin
+  2.5.1
+  
+
+  copy-dependencies
+  package
+

[2/2] git commit: updated refs/heads/master to 5bcd828

2013-10-29 Thread anthonyxu

CLOUDSTACK-4976
 merge createVmFromTemplate in XSFP1 to CitrixResourceBase instead of 
fixing one bug in two different place.

Anthony


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f8781f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f8781f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f8781f6

Branch: refs/heads/master
Commit: 4f8781f681b9dde979521b384e52f3c195f37dfe
Parents: 8a37f40
Author: Anthony Xu 
Authored: Tue Oct 29 14:01:46 2013 -0700
Committer: Anthony Xu 
Committed: Tue Oct 29 15:20:49 2013 -0700

--
 .../xen/resource/CitrixResourceBase.java| 135 ---
 .../xen/resource/XenServer56FP1Resource.java| 133 --
 2 files changed, 86 insertions(+), 182 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f8781f6/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 6c1efe7..3323a15 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -174,6 +174,7 @@ import com.cloud.agent.api.to.VolumeTO;
 import com.cloud.exception.InternalErrorException;
 import com.cloud.host.Host.Type;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.hypervisor.xen.resource.CitrixHelper;
 import com.cloud.network.HAProxyConfigurator;
 import com.cloud.network.LoadBalancerConfigurator;
 import com.cloud.network.Networks;
@@ -1249,69 +1250,108 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 
 return vbd;
 }
+
+
+public long getStaticMax(String os, boolean b, long dynamicMinRam, long 
dynamicMaxRam){
+return dynamicMaxRam;
+}
+
+public long getStaticMin(String os, boolean b, long dynamicMinRam, long 
dynamicMaxRam){
+return dynamicMinRam;
+}
 
 protected VM createVmFromTemplate(Connection conn, VirtualMachineTO 
vmSpec, Host host) throws XenAPIException, XmlRpcException {
 String guestOsTypeName = getGuestOsType(vmSpec.getOs(), 
vmSpec.getBootloader() == BootloaderType.CD);
-if ( guestOsTypeName == null ) {
-String msg =  " Hypervisor " + this.getClass().getName() + " 
doesn't support guest OS type " + vmSpec.getOs()
-+ ". you can choose 'Other install media' to run it as 
HVM";
-s_logger.warn(msg);
-throw new CloudRuntimeException(msg);
-}
 Set templates = VM.getByNameLabel(conn, guestOsTypeName);
 assert templates.size() == 1 : "Should only have 1 template but found 
" + templates.size();
-if (!templates.iterator().hasNext()) {
-throw new CloudRuntimeException("No matching OS type found for 
starting a [" + vmSpec.getOs()
-+ "] VM on host " + host.getHostname(conn));
-}
 VM template = templates.iterator().next();
-VM vm = template.createClone(conn, vmSpec.getName());
-VM.Record vmr = vm.getRecord(conn);
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("Created VM " + vmr.uuid + " for " + 
vmSpec.getName());
+
+VM.Record vmr = template.getRecord(conn);
+vmr.affinity = host;
+vmr.otherConfig.remove("disks");
+vmr.otherConfig.remove("default_template");
+vmr.otherConfig.remove("mac_seed");
+vmr.isATemplate = false;
+vmr.nameLabel = vmSpec.getName();
+vmr.actionsAfterCrash = Types.OnCrashBehaviour.DESTROY;
+vmr.actionsAfterShutdown = Types.OnNormalExit.DESTROY;
+
+if (isDmcEnabled(conn, host) && vmSpec.isEnableDynamicallyScaleVm()) {
+//scaling is allowed
+vmr.memoryStaticMin = getStaticMin(vmSpec.getOs(), 
vmSpec.getBootloader() == BootloaderType.CD, vmSpec.getMinRam(), 
vmSpec.getMaxRam());
+vmr.memoryStaticMax = getStaticMax(vmSpec.getOs(), 
vmSpec.getBootloader() == BootloaderType.CD, vmSpec.getMinRam(), 
vmSpec.getMaxRam());
+vmr.memoryDynamicMin = vmSpec.getMinRam();
+vmr.memoryDynamicMax = vmSpec.getMaxRam();
+} else {
+//scaling disallowed, set static memory target
+if (vmSpec.isEnableDynamicallyScaleVm() && !isDmcEnabled(conn, 
host)) {
+s_logger.warn("Host "+ host.getHostname(conn) +" does not 
support dynamic scaling, so the vm " + vmSpec.getName() + " is not dynamically 
scalable");
+

git commit: updated refs/heads/master to 1d1f585

2013-10-29 Thread jessicawang

Updated Branches:
  refs/heads/master 5bcd8280f -> 1d1f58507


CLOUDSTACK-4758: UI > VM wizard > step 2 > show Root Disk Size field when 
listing is templates, hide Root Disk Size field when listing is ISOs.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1d1f5850
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1d1f5850
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1d1f5850

Branch: refs/heads/master
Commit: 1d1f5850795b5bd9ffc316576fed9197d89e0d1d
Parents: 5bcd828
Author: Jessica Wang 
Authored: Tue Oct 29 15:19:09 2013 -0700
Committer: Jessica Wang 
Committed: Tue Oct 29 15:22:10 2013 -0700

--
 ui/scripts/instanceWizard.js | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1d1f5850/ui/scripts/instanceWizard.js
--
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 484b18c..d2cde2f 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -238,8 +238,12 @@
 templates: templatesObj,
 hypervisors: hypervisorObjs
 },
-customHidden: function(args) {
-return true;
+customHidden: function(args) {
+if (selectedTemplate == 'select-template') {
+return false; //show Root Disk Size field
+} else { //selectedTemplate == 'select-iso'
+   return true;  //hide Root Disk Size field
+}   
 }
 });
 },

git commit: updated refs/heads/master to 6e19864

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 1d1f58507 -> 6e1986408


Breadcrumbs: Fix 'Home' link


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e198640
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e198640
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e198640

Branch: refs/heads/master
Commit: 6e1986408ef4dbb63bd272b95bd4866bb1954f43
Parents: 1d1f585
Author: Brian Federle 
Authored: Tue Oct 29 15:22:19 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 15:22:40 2013 -0700

--
 ui/css/cloudstack3.css | 29 +++--
 1 file changed, 11 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e198640/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 67cdc54..4b5c414 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -3282,14 +3282,13 @@ div.toolbar div.filters select {
 }
 
 #breadcrumbs div.home {
-  width: 41px;
-  height: 32px;
+  width: 71px;
+  height: 23px;
   float: left;
-  background: url(../images/buttons.png) -9px -96px;
-  /*+placement:shift -1px -1px;*/
+  /*+placement:shift -1px 0px;*/
   position: relative;
   left: -1px;
-  top: -1px;
+  top: 0px;
   cursor: pointer;
   z-index: 5;
 }
@@ -3303,7 +3302,8 @@ div.toolbar div.filters select {
 }
 
 #breadcrumbs ul li,
-#breadcrumbs div.active-project {
+#breadcrumbs div.active-project,
+#breadcrumbs .home {
   height: 21px;
   float: left;
   font-size: 11px;
@@ -3318,7 +3318,8 @@ div.toolbar div.filters select {
   margin: 0 0 0 2px;
 }
 
-#breadcrumbs ul li:after {
+#breadcrumbs ul li:after,
+#breadcrumbs .home:after {
   content: ">";
   font-size: 11px;
   /*+placement:shift 7px -1px;*/
@@ -,7 +3334,8 @@ div.toolbar div.filters select {
 }
 
 #breadcrumbs ul li,
-#breadcrumbs div.active-project {
+#breadcrumbs div.active-project,
+#breadcrumbs .home {
   /*+placement:shift 0px 0px;*/
   position: relative;
   left: 0px;
@@ -3347,17 +3349,8 @@ div.toolbar div.filters select {
   color: #00;
 }
 
+/*NOTE: End divs are not displayed per UI changes*/
 #breadcrumbs div.end {
-  background: url(../images/buttons.png) no-repeat -10px -130px;
-  height: 35px;
-  width: 13px;
-  float: left;
-  /*+placement:shift -13px -1px;*/
-  position: relative;
-  left: -13px;
-  top: -1px;
-  z-index: 5;
-  margin-right: 23px;
 }
 
 #breadcrumbs ul div.end {

git commit: updated refs/heads/master to bad6c5d

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 6e1986408 -> bad6c5da3


Infra. chart: Adjust colors for better readability


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bad6c5da
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bad6c5da
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bad6c5da

Branch: refs/heads/master
Commit: bad6c5da3384ea925c952dd595dbdb82c4ca584c
Parents: 6e19864
Author: Brian Federle 
Authored: Tue Oct 29 15:31:57 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 15:31:57 2013 -0700

--
 ui/css/cloudstack3.css | 31 +--
 1 file changed, 21 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bad6c5da/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 4b5c414..362ec93 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8527,7 +8527,6 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
   height: 258px;
   width: 762px;
   display: block;
-  background: #8DA4B9 repeat-x 0px -475px;
   /*+border-radius:3px;*/
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -8538,16 +8537,13 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
   -webkit-box-shadow: inset 0px 0px 1px #FF;
   -o-box-shadow: inset 0px 0px 1px #FF;
   box-shadow: inset 0px 0px 1px #FF;
-  border: 1px solid #7D7D7D;
   position: relative;
   margin: 18px 0 0 15px;
-  font-weight: bold;
 }
 
 .system-dashboard.zone {
   height: 609px;
   background-position: 0px -1423px;
-  background-color: #FF;
 }
 
 .system-dashboard-view .toolbar {
@@ -8578,13 +8574,22 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
   font-size: 13px;
   font-weight: 100;
   background: #DADADA repeat-x 0px -735px;
+  background: rgb(234, 234, 234);
+  background: 
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VhZWFlYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkNmQ2ZDYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+  background: -moz-linear-gradient(top, rgba(234,234,234,1) 0%, 
rgba(214,214,214,1) 100%);
+  background: -webkit-gradient(linear, left top, left bottom, 
color-stop(0%,rgba(234,234,234,1)), color-stop(100%,rgba(214,214,214,1)));
+  background: -webkit-linear-gradient(top, rgba(234,234,234,1) 
0%,rgba(214,214,214,1) 100%);
+  background: -o-linear-gradient(top, rgba(234,234,234,1) 
0%,rgba(214,214,214,1) 100%);
+  background: -ms-linear-gradient(top, rgba(234,234,234,1) 
0%,rgba(214,214,214,1) 100%);
+  background: linear-gradient(to bottom, rgba(234,234,234,1) 
0%,rgba(214,214,214,1) 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eaeaea', 
endColorstr='#d6d6d6',GradientType=0 );
   /*+border-radius:3px;*/
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   -khtml-border-radius: 3px;
   border-radius: 3px;
   border-radius: 3px 3px 3px 3px;
-  border: 1px solid #5A5A5A;
+  border: 1px solid #B5B5B5;
 }
 
 .system-dashboard .view-more:hover,
@@ -8627,7 +8632,7 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
   -khtml-border-radius: 3px;
   border-radius: 3px;
   position: relative;
-  border: 1px solid #808080;
+  border: 1px solid #C6C6C6;
   float: left;
 }
 
@@ -8758,7 +8763,13 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
   left: 9px;
   top: 29px;
   position: absolute;
-  font-weight: normal;
+  font-weight: 100;
+  color: #2B7DAF;
+  /*+text-shadow:0px -1px 2px #FF;*/
+  -moz-text-shadow: 0px -1px 2px #FF;
+  -webkit-text-shadow: 0px -1px 2px #FF;
+  -o-text-shadow: 0px -1px 2px #FF;
+  text-shadow: 0px -1px 2px #FF;
 }
 
 .system-dashboard .status_box li.capacity span.overview.total {
@@ -8832,7 +8843,6 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
 }
 
 .system-dashboard-view .socket-info > .title {
-  border-bottom: 1px solid #7D7D7D;
   padding: 8px;
   font-size: 13px;
 }
@@ -8848,9 +8858,9 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
   -webkit-border-radius

git commit: updated refs/heads/master to 185be21

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master bad6c5da3 -> 185be2141


Adjust button colors; apply CSS gradients to buttons


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/185be214
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/185be214
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/185be214

Branch: refs/heads/master
Commit: 185be2141428a0f0adfdf2a9a0d9bede00f34f93
Parents: bad6c5d
Author: Brian Federle 
Authored: Tue Oct 29 15:39:22 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 15:39:22 2013 -0700

--
 ui/css/cloudstack3.css | 42 +++---
 1 file changed, 31 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/185be214/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 362ec93..5d782b8 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -234,7 +234,7 @@ table tbody tr {
 }
 
 table tbody tr.even {
-  background: #DFE1E3;
+  background: #FF;
 }
 
 table tbody tr.odd {
@@ -2283,7 +2283,6 @@ div.detail-group.actions td {
   position: relative;
   top: 6px;
   left: 7px;
-  font-weight: 100;
 }
 
 #header div.notifications:hover {
@@ -2347,7 +2346,6 @@ div.detail-group.actions td {
   text-align: center;
   height: 12px;
   overflow: hidden;
-  font-weight: normal;
   /*+text-shadow:0px -1px 1px #464646;*/
   -moz-text-shadow: 0px -1px 1px #464646;
   -webkit-text-shadow: 0px -1px 1px #464646;
@@ -2878,7 +2876,7 @@ div.toolbar div.button.main-action,
   position: relative;
   left: 0px;
   top: 5px;
-  background: url(../images/gradients.png) 0px -98px;
+  background: #EAEAEA;
   font-size: 12px;
   font-weight: 100;
   color: #00;
@@ -2890,8 +2888,17 @@ div.toolbar div.button.main-action,
   -o-text-shadow: 0px 1px 1px #DEE5EA;
   text-shadow: 0px 1px 1px #DEE5EA;
   padding: 5px 7px 5px 6px;
-  border-left: 1px solid #808080;
-  border-right: 1px solid #808080;
+  background: #F7F7F7;
+  background: rgb(247, 247, 247);
+  background: 
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2Y3ZjdmNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlYWVhZWEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+  background: -moz-linear-gradient(top, rgba(247,247,247,1) 1%, 
rgba(234,234,234,1) 100%);
+  background: -webkit-gradient(linear, left top, left bottom, 
color-stop(1%,rgba(247,247,247,1)), color-stop(100%,rgba(234,234,234,1)));
+  background: -webkit-linear-gradient(top, rgba(247,247,247,1) 
1%,rgba(234,234,234,1) 100%);
+  background: -o-linear-gradient(top, rgba(247,247,247,1) 
1%,rgba(234,234,234,1) 100%);
+  background: -ms-linear-gradient(top, rgba(247,247,247,1) 
1%,rgba(234,234,234,1) 100%);
+  background: linear-gradient(to bottom, rgba(247,247,247,1) 
1%,rgba(234,234,234,1) 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', 
endColorstr='#eaeaea',GradientType=0 );
+  border: 1px solid #B7B7B7;
   float: right;
   /*+border-radius:4px;*/
   -moz-border-radius: 4px;
@@ -2907,8 +2914,12 @@ div.toolbar div.button.refresh:hover,
 div.toolbar div.button.main-action:hover,
 .toolbar div.button.header-action:hover,
 .detail-group .button.add:hover {
-  background-position: 0 -132px;
-  border-left: 1px solid #585D60;
+  background: #E5E5E5;
+  /*+box-shadow:inset 0px 0px 5px #C3C3C3;*/
+  -moz-box-shadow: inset 0px 0px 5px #C3C3C3;
+  -webkit-box-shadow: inset 0px 0px 5px #C3C3C3;
+  -o-box-shadow: inset 0px 0px 5px #C3C3C3;
+  box-shadow: inset 0px 0px 5px #C3C3C3;
 }
 
 div.toolbar div.button.main-action span.icon {
@@ -4052,8 +4063,16 @@ Dialogs*/
   -webkit-text-shadow: 0px 1px 0px #333E49;
   -o-text-shadow: 0px 1px 0px #333E49;
   padding: 3px 8px 3px 10px;
-  background: #E7E7E7;
-  border: 1px solid #383838;
+  background: rgb(234, 234, 234);
+  background: 
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc

git commit: updated refs/heads/master to 5e9320f

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 185be2141 -> 5e9320faa


Detail view: Adjust tab colors


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e9320fa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e9320fa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e9320fa

Branch: refs/heads/master
Commit: 5e9320faa14f7bd63fdec4aee98cf89d20ace69d
Parents: 185be21
Author: Brian Federle 
Authored: Tue Oct 29 15:43:08 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 15:43:08 2013 -0700

--
 ui/css/cloudstack3.css | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e9320fa/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 5d782b8..7185c85 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1604,13 +1604,14 @@ div.list-view td.state.off span {
 }
 
 .ui-tabs ul li.ui-state-default a {
-  padding-bottom: 12px;
-  border: 1px solid #E2;
+  padding-bottom: 10px;
+  border: 1px solid #D9D9D9;
   /*+border-radius:4px 4px 0 0;*/
   -moz-border-radius: 4px 4px 0 0;
   -webkit-border-radius: 4px 4px 0 0;
   -khtml-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
+  background: #F0F0F0;
 }
 
 .project-view .ui-tabs ul li.ui-state-default a {
@@ -1696,7 +1697,7 @@ div.list-view td.state.off span {
 }
 
 .ui-tabs div.ui-tabs-panel {
-  border: 1px solid #E2;
+  border: 1px solid #D9D9D9;
   clear: both;
   height: 78%;
   width: 97%;

git commit: updated refs/heads/master to e0c0282

2013-10-29 Thread jessicawang

Updated Branches:
  refs/heads/master 5e9320faa -> e0c0282d3


CLOUDSTACK-4758: UI > Create Compute Offering > add new field "Custom" checkbox 
> when it's checked, Number of CPU Cores/CPU/Memory field become non-required 
and hidden.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e0c0282d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0c0282d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0c0282d

Branch: refs/heads/master
Commit: e0c0282d3ba3792c23996bd7ae9714dc70a5099c
Parents: 5e9320f
Author: Jessica Wang 
Authored: Tue Oct 29 15:52:04 2013 -0700
Committer: Jessica Wang 
Committed: Tue Oct 29 15:54:52 2013 -0700

--
 ui/scripts/configuration.js | 33 +
 1 file changed, 29 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0c0282d/ui/scripts/configuration.js
--
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index e76caaf..4280597 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -95,8 +95,15 @@
 });
 }
 },
+isCustomized: {
+label: 'Custom',   

+isBoolean: true,
+isReverse: true,
+isChecked: false
+},
 cpuNumber: {
 label: 'label.num.cpu.cores',
+dependsOn: 'isCustomized',
 docID: 'helpComputeOfferingCPUCores',
 validation: {
 required: true,
@@ -105,6 +112,7 @@
 },
 cpuSpeed: {
 label: 'label.cpu.mhz',
+dependsOn: 'isCustomized',
 docID: 'helpComputeOfferingCPUMHz',
 validation: {
 required: true,
@@ -113,6 +121,7 @@
 },
 memory: {
 label: 'label.memory.mb',
+dependsOn: 'isCustomized',
 docID: 'helpComputeOfferingMemory',
 validation: {
 required: true,
@@ -280,11 +289,27 @@
 name: args.data.name,
 displaytext: args.data.description,
 storageType: args.data.storageType,
-cpuNumber: args.data.cpuNumber,
-cpuSpeed: args.data.cpuSpeed,
-memory: args.data.memory
+customized: (args.data.isCustomized == 
"on")
 };
-
+
+//custom fields (begin)
+if 
(args.$form.find('.form-item[rel=cpuNumber]').css("display") != "none") {
+$.extend(data, {
+   cpuNumber: args.data.cpuNumber
+});
+}
+if 
(args.$form.find('.form-item[rel=cpuSpeed]').css("display") != "none") {
+$.extend(data, {
+   cpuSpeed: args.data.cpuSpeed
+});
+}
+if 
(args.$form.find('.form-item[rel=memory]').css("display") != "none") {
+$.extend(data, {
+   memory: args.data.memory
+});
+}  
+//custom fields (end)
+
 if (args.data.deploymentPlanner != null && 
args.data.deploymentPlanner.length > 0) {
 $.extend(data, {

git commit: updated refs/heads/master to 9d5ea57

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master e0c0282d3 -> 9d5ea5753


Detail view: Adjust tab panel colors

-Remove border/BG from individual group, for better visual flow

-Remove button appearance from actions

-Misc. small positioning tweaks


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d5ea575
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d5ea575
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d5ea575

Branch: refs/heads/master
Commit: 9d5ea575372e15942f35d02158ade809376ae5fc
Parents: e0c0282
Author: Brian Federle 
Authored: Tue Oct 29 15:59:10 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 15:59:57 2013 -0700

--
 ui/css/cloudstack3.css | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d5ea575/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 7185c85..f58bb8c 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1724,14 +1724,9 @@ div.list-view td.state.off span {
 .detail-group table {
   width: 96%;
   font-size: 12px;
-  /*+border-radius:5px;*/
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  -khtml-border-radius: 5px;
-  border-radius: 5px;
-  border-bottom: none;
-  background: #F4F4F4;
-  margin-top: 11px;
+  border-bottom: 1px solid #DFDFDF;
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', 
endColorstr='#eaeaea',GradientType=0 );
+  margin-top: 10px;
 }
 
 .detail-group table tr,
@@ -1741,6 +1736,10 @@ div.list-view td.state.off span {
   cursor: default;
 }
 
+.detail-group table tr.odd {
+  background: none;
+}
+
 .details.group-multiple table {
   border: none;
   border-top: none;
@@ -1757,7 +1756,8 @@ div.list-view td.state.off span {
 
 .detail-group .main-groups table td.name {
   width: 113px;
-  color: #6393F1;
+  color: #6D6D6D;
+  font-weight: bold;
   padding: 14px 12px 13px 13px;
   border: none;
   text-indent: 0;
@@ -1976,7 +1976,7 @@ div.detail-group td.view-all a {
   font-size: 13px;
   display: block;
   text-decoration: none;
-  color: #145A98;
+  color: #0373B7;
   /*+text-shadow:0px 1px 2px #FF;*/
   -moz-text-shadow: 0px 1px 2px #FF;
   -webkit-text-shadow: 0px 1px 2px #FF;
@@ -1991,10 +1991,10 @@ div.detail-group td.view-all:hover a {
 }
 
 div.detail-group td.view-all a span {
-  /*+placement:shift -4px 7px;*/
+  /*+placement:shift -4px -1px;*/
   position: relative;
   left: -4px;
-  top: 7px;
+  top: -1px;
 }
 
 div.detail-group td.view-all:hover a span {
@@ -2042,6 +2042,8 @@ div.details .main-groups label.error {
   display: block;
   float: left;
   height: 28px;
+  margin-left: 0;
+  text-align: left;
 }
 
 /*** Actions*/
@@ -2098,7 +2100,6 @@ div.detail-group.actions td {
 }
 
 .detail-group table td.detail-actions {
-  width: 59%;
   height: 26px;
 }
 
@@ -2140,10 +2141,6 @@ div.detail-group.actions td {
 }
 
 .detail-group table td.detail-actions div.buttons {
-  /*+placement:shift 6px 0px;*/
-  position: relative;
-  left: 6px;
-  top: 0px;
 }
 
 .detail-group table td.detail-actions a {
@@ -2152,7 +2149,6 @@ div.detail-group.actions td {
   text-indent: -px;
   width: 30px;
   height: 25px;
-  background: url(../images/sprites.png) -417px -11px;
   margin: 0;
 }
 
@@ -2181,7 +2177,6 @@ div.detail-group.actions td {
 .detail-group table td.detail-actions div.action.single a {
   width: 31px;
   height: 26px;
-  background: url(../images/buttons.png);
   background-position: -414px -625px;
 }
 
@@ -2418,6 +2413,11 @@ div.detail-group.actions td {
   width: 230px;
   position: relative;
   float: left;
+  /*+box-shadow:inset -1px 4px 7px #DD;*/
+  -moz-box-shadow: inset -1px 4px 7px #DD;
+  -webkit-box-shadow: inset -1px 4px 7px #DD;
+  -o-box-shadow: inset -1px 4px 7px #DD;
+  box-shadow: inset -1px 4px 7px #DD;
   background: #EDE8E8;
   background: 
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjYlIiBzdG9wLWNvbG9yPSIjZWRlOGU4IiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L2xpbmVhckdyYWRpZW50PgogIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZC11Y2dnLWdlbmVyYXRlZCkiIC8+Cjwvc3ZnPg==);
   background: -moz-linear-gradient(top, #ff 0%, #ede8e8 6%);
@@ -8578,7 +8578,7 @@ div.ui-dial

git commit: updated refs/heads/master to 3f2a14b

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 9d5ea5753 -> 3f2a14b8b


Add a bit more padding to header bar


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3f2a14b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3f2a14b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3f2a14b8

Branch: refs/heads/master
Commit: 3f2a14b8b47572d805d5093f39b66d2cf31fc9f8
Parents: 9d5ea57
Author: Brian Federle 
Authored: Tue Oct 29 16:04:53 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 16:04:53 2013 -0700

--
 ui/css/cloudstack3.css | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f2a14b8/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index f58bb8c..e0859cd 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -2197,7 +2197,7 @@ div.detail-group.actions td {
 /*Header*/
 #header {
   width: 100%;
-  height: 117px;
+  height: 135px;
   background: url(../images/overlay-pattern.png) repeat 0, #1B5070 
url(../images/header-gradient.png) no-repeat center;
   background-size: auto, cover;
   position: relative;
@@ -2214,17 +2214,17 @@ div.detail-group.actions td {
   height: 47px;
   margin: auto;
   background: url(../images/logo.png) no-repeat 0 center;
-  /*+placement:shift 0px 2px;*/
+  /*+placement:shift 0px 15px;*/
   position: relative;
   left: 0px;
-  top: 2px;
+  top: 15px;
 }
 
 #header div.controls {
-  width: 1024px;
+  width: 1026px;
   height: 48px;
   position: relative;
-  margin: 9px auto 8px;
+  margin: 27px auto 0;
   padding-top: 13px;
   /*+border-radius:4px 4px 0 0;*/
   -moz-border-radius: 4px 4px 0 0;
@@ -2261,10 +2261,10 @@ div.detail-group.actions td {
   float: right;
   height: 18px;
   padding: 1px 0 0;
-  /*+placement:shift -174px -54px;*/
+  /*+placement:shift -174px -57px;*/
   position: relative;
   left: -174px;
-  top: -54px;
+  top: -57px;
 }
 
 #header div.notifications:after {
@@ -2277,7 +2277,7 @@ div.detail-group.actions td {
 
 #header div.notifications span {
   position: relative;
-  top: 6px;
+  top: 5px;
   left: 7px;
 }
 
@@ -2321,10 +2321,10 @@ div.detail-group.actions td {
 
 #user {
   height: 30px;
-  margin: 5px 6px 0 0;
+  margin: 0;
   position: absolute;
-  top: -48px;
-  left: 880px;
+  top: -47px;
+  left: 890px;
   cursor: default !important;
   display: inline-block;
   float: left;
@@ -2369,10 +2369,10 @@ div.detail-group.actions td {
   width: 11px;
   height: 8px;
   background: url(../images/buttons.png) -402px -23px;
-  /*+placement:shift 10px 13px;*/
+  /*+placement:shift 8px 11px;*/
   position: relative;
-  left: 10px;
-  top: 13px;
+  left: 8px;
+  top: 11px;
 }
 
 /** Zone filter (mixed zone management)*/

git commit: updated refs/heads/master to 088ba84

2013-10-29 Thread bfederle

Updated Branches:
  refs/heads/master 3f2a14b8b -> 088ba84e8


Multi-edit: Fix wrapping on table headers


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/088ba84e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/088ba84e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/088ba84e

Branch: refs/heads/master
Commit: 088ba84e8484fc4be579e20d0424a127f5835acf
Parents: 3f2a14b
Author: Brian Federle 
Authored: Tue Oct 29 16:08:38 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 29 16:08:38 2013 -0700

--
 ui/css/cloudstack3.css | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/088ba84e/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index e0859cd..a75027a 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -7535,6 +7535,9 @@ div.ui-dialog div.multi-edit-add-list div.view 
div.data-table table.body tbody t
 
 .multi-edit table th {
   min-width: 88px;
+  white-space: nowrap;
+  text-align: center;
+  text-indent: 0;
 }
 
 .detail-group .multi-edit table td {

git commit: updated refs/heads/4.2 to 6032a11

2013-10-29 Thread frankzhang

Updated Branches:
  refs/heads/4.2 bab3f0fa0 -> 6032a113a


[UCS] increate ipmi command retry


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6032a113
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6032a113
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6032a113

Branch: refs/heads/4.2
Commit: 6032a113a18a0052669f4a0352b8d66911933cc4
Parents: bab3f0f
Author: Frank.Zhang 
Authored: Tue Oct 29 17:49:39 2013 -0700
Committer: Frank.Zhang 
Committed: Tue Oct 29 17:49:39 2013 -0700

--
 .../networkservice/BareMetalResourceBase.java   | 33 
 1 file changed, 27 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6032a113/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
--
diff --git 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
index abe1d4d..2ce6670 100755
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
@@ -255,8 +255,15 @@ public class BareMetalResourceBase extends ManagerBase 
implements ServerResource
return doScript(cmd, null);
}
 
-   protected boolean doScript(Script cmd, OutputInterpreter interpreter) {
-   int retry = 5;
+protected boolean doScript(Script cmd, int retry) {
+return doScript(cmd, null, retry);
+}
+
+protected boolean doScript(Script cmd, OutputInterpreter interpreter) {
+return doScript(cmd, interpreter, 5);
+}
+
+   protected boolean doScript(Script cmd, OutputInterpreter interpreter, 
int retry) {
String res = null;
while (retry-- > 0) {
if (interpreter == null) {
@@ -266,7 +273,11 @@ public class BareMetalResourceBase extends ManagerBase 
implements ServerResource
}
if (res != null && res.startsWith("Error: Unable to 
establish LAN")) {
s_logger.warn("IPMI script timeout(" + 
cmd.toString() + "), will retry " + retry + " times");
-   continue;
+try {
+TimeUnit.SECONDS.sleep(1);
+} catch (InterruptedException e) {
+}
+continue;
} else if (res == null) {
return true;
} else {
@@ -489,8 +500,17 @@ public class BareMetalResourceBase extends ManagerBase 
implements ServerResource
}
 
protected RebootAnswer execute(final RebootCommand cmd) {
-   if (!doScript(_rebootCommand)) {
-   return new RebootAnswer(cmd, "IPMI reboot failed", 
false);
+String infoStr = "Command not supported in present state";
+OutputInterpreter.AllLinesParser interpreter = new 
OutputInterpreter.AllLinesParser();
+   if (!doScript(_rebootCommand, interpreter, 10)) {
+if (interpreter.getLines().contains(infoStr)) {
+// try again, this error should be temporary
+if (!doScript(_rebootCommand, interpreter, 10)) {
+return new RebootAnswer(cmd, "IPMI reboot failed", false);
+}
+} else {
+   return new RebootAnswer(cmd, "IPMI reboot failed", 
false);
+}
}
 
return new RebootAnswer(cmd, "reboot succeeded", true);
@@ -514,7 +534,8 @@ public class BareMetalResourceBase extends ManagerBase 
implements ServerResource
 
OutputInterpreter.AllLinesParser interpreter = new 
OutputInterpreter.AllLinesParser();
if (!doScript(_getStatusCommand, interpreter)) {
-   s_logger.warn("Cannot get power status of " + 
_name + ", assume VM state was not changed");
+success = true;
+   s_logger.warn("Cannot get power status of " + 
_name + ", assume VM state changed successfully");
break;
}

git commit: CLOUDSTACK-4708 updated with latest alert types in cloudstack

2013-10-29 Thread radhika

Updated Branches:
  refs/heads/master b74319385 -> 1e97c2a1b


CLOUDSTACK-4708 updated with latest alert types in cloudstack


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/1e97c2a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/1e97c2a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/1e97c2a1

Branch: refs/heads/master
Commit: 1e97c2a1b6a203eb6411cdb92717f9f55522970e
Parents: b743193
Author: radhikap 
Authored: Wed Oct 30 11:44:09 2013 +0530
Committer: radhikap 
Committed: Wed Oct 30 11:44:09 2013 +0530

--
 en-US/alerts.xml | 59 ++-
 1 file changed, 30 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/1e97c2a1/en-US/alerts.xml
--
diff --git a/en-US/alerts.xml b/en-US/alerts.xml
index ebea4b8..19efede 100644
--- a/en-US/alerts.xml
+++ b/en-US/alerts.xml
@@ -20,34 +20,35 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
 
-   Alerts
-   The following is the list of alert type numbers. The 
current alerts can be found by calling listAlerts.
-   MEMORY = 0
-   CPU = 1
-   STORAGE =2
-   STORAGE_ALLOCATED = 3
-   PUBLIC_IP = 4
-   PRIVATE_IP = 5
-   HOST = 6
-   USERVM = 7
-   DOMAIN_ROUTER = 8
-   CONSOLE_PROXY = 9
-   ROUTING = 10// lost connection to default route 
(to the gateway)
-   STORAGE_MISC = 11 // lost connection to default 
route (to the gateway)
-   USAGE_SERVER = 12 // lost connection to default 
route (to the gateway)
-   MANAGMENT_NODE = 13 // lost connection to 
default route (to the gateway)
-   DOMAIN_ROUTER_MIGRATE = 14
-   CONSOLE_PROXY_MIGRATE = 15
-   USERVM_MIGRATE = 16
-   VLAN = 17
-   SSVM = 18
-   USAGE_SERVER_RESULT = 19
-   STORAGE_DELETE = 20;
-   UPDATE_RESOURCE_COUNT = 21; //Generated when we 
fail to update the resource count
-   USAGE_SANITY_RESULT = 22;
-   DIRECT_ATTACHED_PUBLIC_IP = 23;
-   LOCAL_STORAGE = 24;
-   RESOURCE_LIMIT_EXCEEDED = 25; //Generated when 
the resource limit exceeds the limit. Currently used for recurring snapshots 
only
+  Alerts
+  The following is the list of alert type numbers. The current alerts 
can be found by calling
+listAlerts.
+  MEMORY = 0 // Available Memory below configured 
threshold
+  CPU = 1 // Unallocated CPU below configured 
threshold
+  STORAGE =2 // Available Storage below configured 
threshold
+  STORAGE_ALLOCATED = 3 // Remaining unallocated Storage is 
below configured threshold
+  PUBLIC_IP = 4 // Number of unallocated virtual network 
public IPs is below configured threshold
+  PRIVATE_IP = 5 // Number of unallocated private IPs is below 
configured threshold
+  SECONDARY_STORAGE = 6 //  Available Secondary Storage in 
availability zone is below configured threshold
+  HOST = 7 // Host related alerts like host 
disconnected
+  USERVM = 8 // User VM stopped unexpectedly
+  DOMAIN_ROUTER = 9 // Domain Router VM stopped 
unexpectedly
+  CONSOLE_PROXY = 10 // Console Proxy VM stopped 
unexpectedly
+  ROUTING = 11 // Lost connection to default route (to the 
gateway)
+  STORAGE_MISC = 12 // Storage issue in system 
VMs
+  USAGE_SERVER = 13 // No usage server process 
running
+  MANAGMENT_NODE = 14 // Management network CIDR is not 
configured originally
+  DOMAIN_ROUTER_MIGRATE = 15 // Domain Router VM Migration was 
unsuccessful
+  CONSOLE_PROXY_MIGRATE = 16 // Console Proxy VM Migration was 
unsuccessful
+  USERVM_MIGRATE = 17 // User VM Migration was 
unsuccessful
+  VLAN = 18 // Number of unallocated VLANs is below configured 
threshold in availability zone
+  SSVM = 19 // SSVM stopped unexpectedly
+  USAGE_SERVER_RESULT = 20 // Usage job failed
+  STORAGE_DELETE = 21 // Failed to delete storage 
pool
+  UPDATE_RESOURCE_COUNT = 22 // Failed to update the resource 
count
+  USAGE_SANITY_RESULT = 23 // Usage Sanity Check 
failed
+  DIRECT_ATTACHED_PUBLIC_IP = 24 // Number of unallocated 
shared network IPs is low in availability zone
+  LOCAL_STORAGE = 25 // Remaining unallocated Local Storage is 
below configured threshold
+  RESOURCE_LIMIT_EXCEEDED = 26 //Generated when the resource 
limit exceeds the limit. Currently used for recurring snapshots 
only

47 matches

Mail list logo