git commit: updated refs/heads/4.4 to d00d281

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 c94158f0f -> d00d28105


CLOUDSTACK-6241: Fix default route for IPv6 network when IPv4 not used
(cherry picked from commit e406adc0810b22ded0964080946f019be1337b52)


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

Branch: refs/heads/4.4
Commit: d00d28105e75b0108ace33361ef11f8e4115f002
Parents: c94158f
Author: Sheng Yang 
Authored: Fri Mar 14 13:36:43 2014 -0700
Committer: Daan Hoogland 
Committed: Wed May 14 09:02:40 2014 +0200

--
 systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d00d2810/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
--
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh 
b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
index 8e7ddac..70c95a8 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
@@ -184,7 +184,7 @@ then
   echo "$ipv6 $host" >> $HOSTS
 fi
 
-if [ "$dflt" != "" ]
+if [ "$dflt" != "" -a "$ipv4" != "" ]
 then
   #make sure dnsmasq looks into options file
   sed -i /dhcp-optsfile/d /etc/dnsmasq.conf

git commit: updated refs/heads/4.4 to 866e73d

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 d00d28105 -> 866e73df6


CLOUDSTACK-6614 bugfix: systemvm template build failed because of src iso link 
is broken


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

Branch: refs/heads/4.4
Commit: 866e73df66ab6a3cf6a172c9d726d5d1f18cf51e
Parents: d00d281
Author: ynojima 
Authored: Thu May 8 16:48:18 2014 -0600
Committer: Daan Hoogland 
Committed: Wed May 14 09:20:37 2014 +0200

--
 tools/appliance/definitions/systemvm64template/definition.rb | 2 +-
 tools/appliance/definitions/systemvmtemplate/definition.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/866e73df/tools/appliance/definitions/systemvm64template/definition.rb
--
diff --git a/tools/appliance/definitions/systemvm64template/definition.rb 
b/tools/appliance/definitions/systemvm64template/definition.rb
index bea2fde..f9308a0 100644
--- a/tools/appliance/definitions/systemvm64template/definition.rb
+++ b/tools/appliance/definitions/systemvm64template/definition.rb
@@ -4,7 +4,7 @@ Veewee::Definition.declare({
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-7.4.0-amd64-netinst.iso",
-  :iso_src => 
"http://ftp.acc.umu.se/mirror/cdimage/release/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso";,
+  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso";,
   :iso_md5 => "e7e9433973f082a297793c3c5010b2c5",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/866e73df/tools/appliance/definitions/systemvmtemplate/definition.rb
--
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index c8b24d6..fcaab4d 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -4,7 +4,7 @@ Veewee::Definition.declare({
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-7.4.0-i386-netinst.iso",
-  :iso_src => 
"http://ftp.acc.umu.se/mirror/cdimage/release/7.4.0/i386/iso-cd/debian-7.4.0-i386-netinst.iso";,
+  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.4.0/i386/iso-cd/debian-7.4.0-i386-netinst.iso";,
   :iso_md5 => "7339b668a81b417ac023d73739dc6a03",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

git commit: Remove blank line

[sebgoa]

Repository: cloudstack-docs
Updated Branches:
  refs/heads/master 6ae164110 -> 97d080191


Remove blank line


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

Branch: refs/heads/master
Commit: 97d08019195a8d6dfda28fa39cb41b9a873a1e47
Parents: 6ae1641
Author: Sebastien Goasguen 
Authored: Wed May 14 09:38:11 2014 +0200
Committer: Sebastien Goasguen 
Committed: Wed May 14 09:38:11 2014 +0200

--
 rtd/source/index.rst | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/97d08019/rtd/source/index.rst
--
diff --git a/rtd/source/index.rst b/rtd/source/index.rst
index 6927206..d24d2c8 100644
--- a/rtd/source/index.rst
+++ b/rtd/source/index.rst
@@ -34,7 +34,6 @@ Now that you have gone over the basic concepts of CloudStack 
you are ready to di
 - `Release Notes 
`_
 
 Below you will find very specific documentation on advanced networking_ which 
you can skip if you are just getting started.
-
 Developers will also find below a short developers_ guide. 
 
 .. _networking:

git commit: Added warning

[sebgoa]

Repository: cloudstack-docs-install
Updated Branches:
  refs/heads/master d1e03dca7 -> 30cd8571a


Added warning


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

Branch: refs/heads/master
Commit: 30cd8571a5d1e3f0592c8e62ffaee73a7af00031
Parents: d1e03dc
Author: Sebastien Goasguen 
Authored: Wed May 14 09:39:57 2014 +0200
Committer: Sebastien Goasguen 
Committed: Wed May 14 09:39:57 2014 +0200

--
 source/index.rst | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/30cd8571/source/index.rst
--
diff --git a/source/index.rst b/source/index.rst
index 2ff98f4..d5de6e5 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -24,6 +24,9 @@ Welcome to CloudStack Installation Documentation
 .. figure:: /_static/images/acslogo.png
 :align: center
 
+.. warning:: We are in the process of changing documentation format as well as 
hosting mechanism.
+ Please be patient with us as we migrate our entire documentation 
to this new setup.
+
 This is the Apache CloudStack installation guide, for the Documentation home, 
the administrator guide or the Release-Notes please see:
 
 - `Documentation home `_

git commit: updated refs/heads/4.3-forward to 156bd9b

[jlk]

Repository: cloudstack
Updated Branches:
  refs/heads/4.3-forward 76872f628 -> 156bd9b88


Applying missed patch from CLOUDSTACK-6204

Was brought to my attention that when I manually applied the
CLOUDSTACK-6204 patch to 4.3-forward, somehow the changes for
ConsoleProxyInof.java were missed. Fixing that here.

BUG-ID: CLOUDSTACK-6204
Bugfix-for: 4.3 (exists in 0e57b75 on master)
Signed-off-by: John Kinsella  1400052371 -0700


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

Branch: refs/heads/4.3-forward
Commit: 156bd9b88589897f7a3c102104fc7cbe29354251
Parents: 76872f6
Author: John Kinsella 
Authored: Wed May 14 00:26:11 2014 -0700
Committer: John Kinsella 
Committed: Wed May 14 00:26:11 2014 -0700

--
 core/src/com/cloud/info/ConsoleProxyInfo.java | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/156bd9b8/core/src/com/cloud/info/ConsoleProxyInfo.java
--
diff --git a/core/src/com/cloud/info/ConsoleProxyInfo.java 
b/core/src/com/cloud/info/ConsoleProxyInfo.java
index 3439f3d..096302c 100644
--- a/core/src/com/cloud/info/ConsoleProxyInfo.java
+++ b/core/src/com/cloud/info/ConsoleProxyInfo.java
@@ -32,17 +32,17 @@ public class ConsoleProxyInfo {
this.sslEnabled = sslEnabled;

if(sslEnabled) {
-   StringBuffer sb = new StringBuffer(proxyIpAddress);
-   for(int i = 0; i < sb.length(); i++)
-   if(sb.charAt(i) == '.')
-   sb.setCharAt(i, '-');
-   if(consoleProxyUrlDomain!=null && 
consoleProxyUrlDomain.length()>0)
-   {
-   sb.append(".");
-   sb.append(consoleProxyUrlDomain);
-   }
-   else
+   StringBuffer sb = new StringBuffer();
+   if (consoleProxyUrlDomain.startsWith("*")) {
+   sb.append(proxyIpAddress);
+   for (int i = 0; i < proxyIpAddress.length(); 
i++)
+   if (sb.charAt(i) == '.')
+   sb.setCharAt(i, '-');
+   sb.append(consoleProxyUrlDomain.substring(1)); 
//skip the *
+   } else {
+   //LB address
sb.append(".realhostip.com");
+   }

proxyAddress = sb.toString();
proxyPort = port;

git commit: Fix ssvm template URL in qig

[sebgoa]

Repository: cloudstack-docs-install
Updated Branches:
  refs/heads/master 30cd8571a -> 4f274c06d


Fix ssvm template URL in qig


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

Branch: refs/heads/master
Commit: 4f274c06d23c425d62a0e3a135f5f41725eaa12e
Parents: 30cd857
Author: Sebastien Goasguen 
Authored: Wed May 14 11:00:43 2014 +0200
Committer: Sebastien Goasguen 
Committed: Wed May 14 11:00:43 2014 +0200

--
 source/qig.rst | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/4f274c06/source/qig.rst
--
diff --git a/source/qig.rst b/source/qig.rst
index 1d3995e..5451647 100644
--- a/source/qig.rst
+++ b/source/qig.rst
@@ -348,10 +348,8 @@ Now we need to download the system VM template and deploy 
that to the share we j
 server includes a script to properly manipulate the system VMs images.
 
   .. sourcecode:: bash
-
- # 
/usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt 
-m \ 
- /secondary -u 
http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 \
- -h kvm -F
+
+# 
/usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt 
-m /secondary -u 
http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2
 -h kvm -F
 
 That concludes our setup of the management server. We still need to configure 
CloudStack, but we will do that after we
 get our hypervisor set up.

git commit: Write intro paragraph with links to individual sections

[sebgoa]

Repository: cloudstack-docs-install
Updated Branches:
  refs/heads/master 5feae430d -> d1e03dca7


Write intro paragraph with links to individual sections


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

Branch: refs/heads/master
Commit: d1e03dca7b28ec608e2199ec00d3f37eef130ebe
Parents: 5feae43
Author: Sebastien Goasguen 
Authored: Tue May 13 13:30:54 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue May 13 13:30:54 2014 +0200

--
 source/index.rst | 49 +
 1 file changed, 33 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/d1e03dca/source/index.rst
--
diff --git a/source/index.rst b/source/index.rst
index 6fc6f62..2ff98f4 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -18,22 +18,25 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
 
+Welcome to CloudStack Installation Documentation
+
+
 .. figure:: /_static/images/acslogo.png
 :align: center
 
-Quicklinks to CloudStack documentations:
-
-  * `Documentation home `_
-  * `Administration Guide 
`_
-  * `Release Notes 
`_
+This is the Apache CloudStack installation guide, for the Documentation home, 
the administrator guide or the Release-Notes please see:
 
+- `Documentation home `_
+- `Administration Guide 
`_
+- `Release Notes 
`_
 
+.. note:: In this guide we first go through some design and architectural 
choices_ to build your cloud.
+  Then we dive into a single node quick start guide_ to give you a 
feel for the installation process. The source installation
+  steps_ are given in the follow-on section for people who want to 
build their own packages. Otherwise you can use the general installation_
+  which makes use of community maintained package repositories. The 
rest of the guide goes through the configuration_ of the data-center and
+  the setup of the network_, storage_ and hypervisors_.
 
-Welcome to CloudStack Installation Documentation
-
-
-.. toctree::
-   :maxdepth: 2
+.. _choices:
 
 Choosing a Deployment Architecture
 --
@@ -42,6 +45,8 @@ Choosing a Deployment Architecture
 
 choosing_deployment_architecture
 
+.. _guide:
+
 Quick Installation Guide
 
 .. toctree::
@@ -49,12 +54,7 @@ Quick Installation Guide
 
 qig
 
-General Installation
-
-.. toctree::
-:maxdepth: 2
-
-installation
+.. _steps:
 
 Source Installation
 ---
@@ -63,6 +63,17 @@ Source Installation
 
 building_from_source
 
+.. _installation:
+
+General Installation
+
+.. toctree::
+:maxdepth: 2
+
+installation
+
+.. _configuration:
+
 Configuration
 -
 .. toctree::
@@ -70,6 +81,8 @@ Configuration
 
 configuration
 
+.. _hypervisors:
+
 Hypervisor Installation
 ---
 .. toctree::
@@ -81,6 +94,8 @@ Hypervisor Installation
 hypervisor/lxc.rst
 hypervisor/hyperv.rst
 
+.. _network:
+
 Network Setup
 -
 .. toctree::
@@ -88,6 +103,8 @@ Network Setup
 
 network_setup
 
+.. _storage:
+
 Storage Setup
 -
 .. toctree::

git commit: working on the TOC

[sebgoa]

Repository: cloudstack-docs-install
Updated Branches:
  refs/heads/master 4f274c06d -> 96ff1892d


working on the TOC


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

Branch: refs/heads/master
Commit: 96ff1892d23de28340fa318fae7b0507648e0279
Parents: 4f274c0
Author: Sebastien Goasguen 
Authored: Wed May 14 11:21:33 2014 +0200
Committer: Sebastien Goasguen 
Committed: Wed May 14 11:21:33 2014 +0200

--
 source/hypervisor/hyperv.rst |  6 +++---
 source/index.rst | 13 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/96ff1892/source/hypervisor/hyperv.rst
--
diff --git a/source/hypervisor/hyperv.rst b/source/hypervisor/hyperv.rst
index ccf26e0..145741e 100644
--- a/source/hypervisor/hyperv.rst
+++ b/source/hypervisor/hyperv.rst
@@ -13,8 +13,8 @@
specific language governing permissions and limitations
under the License.
 
-Installing Hyper-V for CloudStack
--
+Hyper-V Installation and Configuration
+--
 
 If you want to use Hyper-V hypervisor to run guest virtual machines,
 install Hyper-V on the hosts in your cloud. The instructions in this
@@ -298,4 +298,4 @@ Secondary Storage that uses SMB.
 
While adding storage to CloudStack, ensure that the correct domain,
and credentials are supplied. This user should be able to access the
-   storage from the Management Server.
\ No newline at end of file
+   storage from the Management Server.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-install/blob/96ff1892/source/index.rst
--
diff --git a/source/index.rst b/source/index.rst
index d5de6e5..bd88672 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -39,6 +39,8 @@ This is the Apache CloudStack installation guide, for the 
Documentation home, th
   which makes use of community maintained package repositories. The 
rest of the guide goes through the configuration_ of the data-center and
   the setup of the network_, storage_ and hypervisors_.
 
+.. toctree::
+
 .. _choices:
 
 Choosing a Deployment Architecture
@@ -86,16 +88,13 @@ Configuration
 
 .. _hypervisors:
 
-Hypervisor Installation

+Hypervisor Setup
+
 .. toctree::
 :maxdepth: 2
+:glob:
 
-hypervisor/kvm.rst
-hypervisor/xenserver.rst
-hypervisor/vsphere.rst
-hypervisor/lxc.rst
-hypervisor/hyperv.rst
+hypervisor/*
 
 .. _network:
 

git commit: Fix toc

[sebgoa]

Repository: cloudstack-docs
Updated Branches:
  refs/heads/master 97d080191 -> 7d359963a


Fix toc


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

Branch: refs/heads/master
Commit: 7d359963a195bf60be9fe3747418b5283f7bd084
Parents: 97d0801
Author: Sebastien Goasguen 
Authored: Wed May 14 11:25:01 2014 +0200
Committer: Sebastien Goasguen 
Committed: Wed May 14 11:25:01 2014 +0200

--
 rtd/source/index.rst | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/7d359963/rtd/source/index.rst
--
diff --git a/rtd/source/index.rst b/rtd/source/index.rst
index d24d2c8..3972486 100644
--- a/rtd/source/index.rst
+++ b/rtd/source/index.rst
@@ -12,6 +12,8 @@ Welcome to CloudStack Documentation !
 .. warning:: We are in the process of changing documentation format as well as 
hosting mechanism.
  Please be patient with us as we migrate our entire documentation 
to this new setup.
 
+.. toctree::
+
 Introduction
 
 

git commit: updated refs/heads/master to 35cd61c

[sanjaytripathi]

Repository: cloudstack
Updated Branches:
  refs/heads/master a605ca09c -> 35cd61c46


CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce.


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

Branch: refs/heads/master
Commit: 35cd61c46314290904189d1b1515413337011f43
Parents: a605ca0
Author: Sanjay Tripathi 
Authored: Tue May 13 15:00:11 2014 +0530
Committer: Sanjay Tripathi 
Committed: Wed May 14 15:05:28 2014 +0530

--
 api/src/com/cloud/agent/api/VgpuTypesInfo.java  |  8 ++-
 api/src/com/cloud/capacity/Capacity.java|  1 +
 .../cloudstack/api/response/HostResponse.java   |  1 +
 .../src/com/cloud/gpu/dao/HostGpuGroupsDao.java |  2 +-
 .../src/com/cloud/gpu/dao/VGPUTypesDao.java | 47 ++---
 .../src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 54 +++-
 .../src/com/cloud/vm/dao/VMInstanceDao.java |  3 ++
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 46 +
 .../xen/resource/XenServer620SP1Resource.java   |  2 +-
 server/src/com/cloud/api/ApiDBUtils.java| 10 
 server/src/com/cloud/api/ApiResponseHelper.java | 40 +++
 ui/scripts/sharedFunctions.js   |  2 +
 ui/scripts/ui-custom/zoneChart.js   |  3 ++
 13 files changed, 195 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35cd61c4/api/src/com/cloud/agent/api/VgpuTypesInfo.java
--
diff --git a/api/src/com/cloud/agent/api/VgpuTypesInfo.java 
b/api/src/com/cloud/agent/api/VgpuTypesInfo.java
index ed54c5a..85ffc18 100644
--- a/api/src/com/cloud/agent/api/VgpuTypesInfo.java
+++ b/api/src/com/cloud/agent/api/VgpuTypesInfo.java
@@ -18,6 +18,7 @@ package com.cloud.agent.api;
 public class VgpuTypesInfo {
 
 private String modelName;
+private String groupName;
 private Long maxHeads;
 private Long videoRam;
 private Long maxResolutionX;
@@ -30,6 +31,10 @@ public class VgpuTypesInfo {
 return modelName;
 }
 
+public String getGroupName() {
+return groupName;
+}
+
 public Long getVideoRam() {
 return videoRam;
 }
@@ -66,8 +71,9 @@ public class VgpuTypesInfo {
 this.maxCapacity = maxCapacity;
 }
 
-public VgpuTypesInfo(String modelName, Long videoRam, Long maxHeads, Long 
maxResolutionX, Long maxResolutionY, Long maxVgpuPerGpu,
+public VgpuTypesInfo(String groupName, String modelName, Long videoRam, 
Long maxHeads, Long maxResolutionX, Long maxResolutionY, Long maxVgpuPerGpu,
 Long remainingCapacity, Long maxCapacity) {
+this.groupName = groupName;
 this.modelName = modelName;
 this.videoRam = videoRam;
 this.maxHeads = maxHeads;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35cd61c4/api/src/com/cloud/capacity/Capacity.java
--
diff --git a/api/src/com/cloud/capacity/Capacity.java 
b/api/src/com/cloud/capacity/Capacity.java
index c1c5d8f..2fbc1d6 100755
--- a/api/src/com/cloud/capacity/Capacity.java
+++ b/api/src/com/cloud/capacity/Capacity.java
@@ -30,6 +30,7 @@ public interface Capacity extends InternalIdentity, Identity {
 public static final short CAPACITY_TYPE_VLAN = 7;
 public static final short CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP = 8;
 public static final short CAPACITY_TYPE_LOCAL_STORAGE = 9;
+public static final short CAPACITY_TYPE_GPU = 19;
 
 public Long getHostOrPoolId();
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35cd61c4/api/src/org/apache/cloudstack/api/response/HostResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java 
b/api/src/org/apache/cloudstack/api/response/HostResponse.java
index 008631f..d7638de 100644
--- a/api/src/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HostResponse.java
@@ -328,6 +328,7 @@ public class HostResponse extends BaseResponse {
 public void setGpuGroups(List gpuGroup) {
 this.gpuGroup = gpuGroup;
 }
+
 public void setDiskSizeTotal(Long diskSizeTotal) {
 this.diskSizeTotal = diskSizeTotal;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35cd61c4/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDao.java
--
diff --git a/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDao.java 
b/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsD

git commit: updated refs/heads/4.4-forward to e7e1ae2

[sanjaytripathi]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward d32f5c70d -> e7e1ae254


CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce.


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

Branch: refs/heads/4.4-forward
Commit: e7e1ae254af8588a90bee56f5dcd1175c64ffd5e
Parents: d32f5c7
Author: Sanjay Tripathi 
Authored: Tue May 13 15:00:11 2014 +0530
Committer: Sanjay Tripathi 
Committed: Wed May 14 15:02:59 2014 +0530

--
 api/src/com/cloud/agent/api/VgpuTypesInfo.java  |  8 ++-
 api/src/com/cloud/capacity/Capacity.java|  1 +
 .../cloudstack/api/response/HostResponse.java   |  1 +
 .../src/com/cloud/gpu/dao/HostGpuGroupsDao.java |  2 +-
 .../src/com/cloud/gpu/dao/VGPUTypesDao.java | 47 ++---
 .../src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 54 +++-
 .../src/com/cloud/vm/dao/VMInstanceDao.java |  3 ++
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 46 +
 .../xen/resource/XenServer620SP1Resource.java   |  2 +-
 server/src/com/cloud/api/ApiDBUtils.java| 10 
 server/src/com/cloud/api/ApiResponseHelper.java | 40 +++
 ui/scripts/sharedFunctions.js   |  2 +
 ui/scripts/ui-custom/zoneChart.js   |  3 ++
 13 files changed, 195 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7e1ae25/api/src/com/cloud/agent/api/VgpuTypesInfo.java
--
diff --git a/api/src/com/cloud/agent/api/VgpuTypesInfo.java 
b/api/src/com/cloud/agent/api/VgpuTypesInfo.java
index ed54c5a..85ffc18 100644
--- a/api/src/com/cloud/agent/api/VgpuTypesInfo.java
+++ b/api/src/com/cloud/agent/api/VgpuTypesInfo.java
@@ -18,6 +18,7 @@ package com.cloud.agent.api;
 public class VgpuTypesInfo {
 
 private String modelName;
+private String groupName;
 private Long maxHeads;
 private Long videoRam;
 private Long maxResolutionX;
@@ -30,6 +31,10 @@ public class VgpuTypesInfo {
 return modelName;
 }
 
+public String getGroupName() {
+return groupName;
+}
+
 public Long getVideoRam() {
 return videoRam;
 }
@@ -66,8 +71,9 @@ public class VgpuTypesInfo {
 this.maxCapacity = maxCapacity;
 }
 
-public VgpuTypesInfo(String modelName, Long videoRam, Long maxHeads, Long 
maxResolutionX, Long maxResolutionY, Long maxVgpuPerGpu,
+public VgpuTypesInfo(String groupName, String modelName, Long videoRam, 
Long maxHeads, Long maxResolutionX, Long maxResolutionY, Long maxVgpuPerGpu,
 Long remainingCapacity, Long maxCapacity) {
+this.groupName = groupName;
 this.modelName = modelName;
 this.videoRam = videoRam;
 this.maxHeads = maxHeads;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7e1ae25/api/src/com/cloud/capacity/Capacity.java
--
diff --git a/api/src/com/cloud/capacity/Capacity.java 
b/api/src/com/cloud/capacity/Capacity.java
index c1c5d8f..2fbc1d6 100755
--- a/api/src/com/cloud/capacity/Capacity.java
+++ b/api/src/com/cloud/capacity/Capacity.java
@@ -30,6 +30,7 @@ public interface Capacity extends InternalIdentity, Identity {
 public static final short CAPACITY_TYPE_VLAN = 7;
 public static final short CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP = 8;
 public static final short CAPACITY_TYPE_LOCAL_STORAGE = 9;
+public static final short CAPACITY_TYPE_GPU = 19;
 
 public Long getHostOrPoolId();
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7e1ae25/api/src/org/apache/cloudstack/api/response/HostResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java 
b/api/src/org/apache/cloudstack/api/response/HostResponse.java
index 008631f..d7638de 100644
--- a/api/src/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HostResponse.java
@@ -328,6 +328,7 @@ public class HostResponse extends BaseResponse {
 public void setGpuGroups(List gpuGroup) {
 this.gpuGroup = gpuGroup;
 }
+
 public void setDiskSizeTotal(Long diskSizeTotal) {
 this.diskSizeTotal = diskSizeTotal;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7e1ae25/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDao.java
--
diff --git a/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDao.java 
b/engine/schema/src/com/cloud/gpu/dao/Host

git commit: Remove duplicate section in Concepts chapter

[sebgoa]

Repository: cloudstack-docs
Updated Branches:
  refs/heads/master 7d359963a -> 8052b1961


Remove duplicate section in Concepts chapter


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

Branch: refs/heads/master
Commit: 8052b1961c1490cecd2430b3ba9b0e92b42eb943
Parents: 7d35996
Author: Sebastien Goasguen 
Authored: Wed May 14 12:35:03 2014 +0200
Committer: Sebastien Goasguen 
Committed: Wed May 14 12:35:03 2014 +0200

--
 rtd/source/concepts.rst | 249 ---
 1 file changed, 249 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/8052b196/rtd/source/concepts.rst
--
diff --git a/rtd/source/concepts.rst b/rtd/source/concepts.rst
index 817d0b5..f004c1c 100644
--- a/rtd/source/concepts.rst
+++ b/rtd/source/concepts.rst
@@ -144,255 +144,6 @@ CloudStack offers many types of networking, but they 
typically fall into one of
 * Basic: Most analogous to AWS-classic style networking. Provides a single 
flat layer-2 network where guest isolation is provided at layer-3 by the 
hypervisors bridge device. 
 * Advanced: This typically uses layer-2 isolation such as VLANs, though this 
category also includes SDN technologies such as Nicira NVP.
 
-Cloud Infrastructure Concepts
--
-
-Regions
-~~~
-
-To increase reliability of the cloud, you can optionally group resources into 
multiple geographic regions. A region 
-is the largest available organizational unit within a CloudStack deployment. A 
region is made up of several 
-availability zones, where each zone is roughly equivalent to a datacenter. 
Each region is controlled by its own 
-cluster of Management Servers, running in one of the zones. The zones in a 
region are typically located in close 
-geographical proximity. Regions are a useful technique for providing fault 
tolerance and disaster recovery.
-
-By grouping zones into regions, the cloud can achieve higher availability and 
scalability. User accounts can span 
-regions, so that users can deploy VMs in multiple, widely-dispersed regions. 
Even if one of the regions becomes 
-unavailable, the services are still available to the end-user through VMs 
deployed in another region. And by 
-grouping communities of zones under their own nearby Management Servers, the 
latency of communications within 
-the cloud is reduced compared to managing widely-dispersed zones from a single 
central Management Server.
-
-Usage records can also be consolidated and tracked at the region level, 
creating reports or invoices for each geographic region.
-
-.. image:: _static/images/region-overview.png
-
-Regions are visible to the end user. When a user starts a guest VM on a 
particular CloudStack Management Server, 
-the user is implicitly selecting that region for their guest. Users might also 
be required to copy their private 
-templates to additional regions to enable creation of guest VMs using their 
templates in those regions.
-
-Zones
-~
-
-A zone is the second largest organizational unit within a CloudStack 
deployment. A zone typically corresponds to a 
-single datacenter, although it is permissible to have multiple zones in a 
datacenter. The benefit of organizing 
-infrastructure into zones is to provide physical isolation and redundancy. For 
example, each zone can have its 
-own power supply and network uplink, and the zones can be widely separated 
geographically (though this is not required).
-
-A zone consists of:
-
-* One or more pods. Each pod contains one or more clusters of hosts and one or 
more primary storage servers.
-* A zone may contain one or more primary storage servers, which are shared by 
all the pods in the zone.
-* Secondary storage, which is shared by all the pods in the zone.
-
-.. image:: _static/images/zone-overview.png
-
-Zones are visible to the end user. When a user starts a guest VM, the user 
must select a zone for their guest. 
-Users might also be required to copy their private templates to additional 
zones to enable creation of guest 
-VMs using their templates in those zones.
-
-Zones can be public or private. Public zones are visible to all users. This 
means that any user may create a 
-guest in that zone. Private zones are reserved for a specific domain. Only 
users in that domain or its 
-subdomains may create guests in that zone.
-
-Hosts in the same zone are directly accessible to each other without having to 
go through a firewall. Hosts 
-in different zones can access each other through statically configured VPN 
tunnels.
-
-For each 

git commit: Add Hyper-V in concepts section

[sebgoa]

Repository: cloudstack-docs
Updated Branches:
  refs/heads/master 8052b1961 -> 8a05757d9


Add Hyper-V in concepts section


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

Branch: refs/heads/master
Commit: 8a05757d91b34d4f744c65e8469597c07461f9b0
Parents: 8052b19
Author: Sebastien Goasguen 
Authored: Wed May 14 12:36:59 2014 +0200
Committer: Sebastien Goasguen 
Committed: Wed May 14 12:36:59 2014 +0200

--
 rtd/source/concepts.rst | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/8a05757d/rtd/source/concepts.rst
--
diff --git a/rtd/source/concepts.rst b/rtd/source/concepts.rst
index f004c1c..5860aa4 100644
--- a/rtd/source/concepts.rst
+++ b/rtd/source/concepts.rst
@@ -38,11 +38,13 @@ CloudStack works with a variety of hypervisors and 
hypervisor-like technologies.
 cloud can contain multiple hypervisor implementations. As of the current 
release CloudStack 
 supports: 
 
-* vSphere (via vCenter)
+* BareMetal (via IPMI)
+* Hyper-V
 * KVM
-* Xenserver
 * LXC
-* BareMetal (via IPMI)
+* vSphere (via vCenter)
+* Xenserver
+* Xen Project
 
 Massively Scalable Infrastructure Management
 

git commit: updated refs/heads/master to 63f6888

[muralireddy]

Repository: cloudstack
Updated Branches:
  refs/heads/master 35cd61c46 -> 63f688858


CLOUDSTACK-6668: OVS distributed routing: ensure bridge is deleted when
last VM from the VPC is deleted on a host

OVS distributed routing: ensure bridge is deleted when last VM from the
VPC is deleted on a host. This fix ensures that bridge is
destroyed.


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

Branch: refs/heads/master
Commit: 63f6888588a85486b13bb7b9b7829e342c9f2990
Parents: 35cd61c
Author: Murali Reddy 
Authored: Wed May 14 16:38:17 2014 +0530
Committer: Murali Reddy 
Committed: Wed May 14 16:41:56 2014 +0530

--
 .../xen/resource/CitrixResourceBase.java| 36 
 .../agent/api/OvsDestroyBridgeCommand.java  |  8 +-
 .../network/ovs/OvsNetworkTopologyGuru.java |  2 +-
 .../network/ovs/OvsNetworkTopologyGuruImpl.java | 10 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java | 96 +++-
 .../xenserver/cloudstack_pluginlib.py   | 12 ++-
 scripts/vm/hypervisor/xenserver/ovstunnel   | 27 --
 7 files changed, 111 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63f68885/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 d5b70aa..8371a93 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
@@ -982,6 +982,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 Network.Record rec = new Network.Record();
 Set networks = Network.getByNameLabel(conn, nwName);
 
+
 if (networks.size() == 0) {
 rec.nameDescription = "tunnel network id# " + nwName;
 rec.nameLabel = nwName;
@@ -1056,11 +1057,11 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 }
 
-private synchronized void destroyTunnelNetwork(Connection conn, String 
bridgeName) {
+private synchronized void destroyTunnelNetwork(Connection conn, Network 
nw, long hostId) {
 try {
-Network nw = findOrCreateTunnelNetwork(conn, bridgeName);
 String bridge = nw.getBridge(conn);
-String result = callHostPlugin(conn, "ovstunnel", 
"destroy_ovs_bridge", "bridge", bridge);
+String result = callHostPlugin(conn, "ovstunnel", 
"destroy_ovs_bridge", "bridge", bridge,
+"cs_host_id", ((Long)hostId).toString());
 String[] res = result.split(":");
 if (res.length != 2 || !res[0].equalsIgnoreCase("SUCCESS")) {
 //TODO: Should make this error not fatal?
@@ -1666,14 +1667,12 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 return cmd;
 }
 
-private void cleanUpTmpDomVif(Connection conn, Network nw) {
-List vifs;
-synchronized (_tmpDom0Vif) {
-vifs = _tmpDom0Vif;
-_tmpDom0Vif = new ArrayList();
-}
+private void cleanUpTmpDomVif(Connection conn, Network nw) throws 
XenAPIException, XmlRpcException {
 
-for (VIF v : vifs) {
+Pair vm = getControlDomain(conn);
+VM dom0 = vm.first();
+Set dom0Vifs = dom0.getVIFs(conn);
+for (VIF v : dom0Vifs) {
 String vifName = "unknown";
 try {
 VIF.Record vifr = v.getRecord(conn);
@@ -5266,12 +5265,17 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 
 private Answer execute(OvsDestroyBridgeCommand cmd) {
-Connection conn = getConnection();
-Network nw = findOrCreateTunnelNetwork(conn, cmd.getBridgeName());
-cleanUpTmpDomVif(conn, nw);
-destroyTunnelNetwork(conn, cmd.getBridgeName());
-s_logger.debug("OVS Bridge destroyed");
-return new Answer(cmd, true, null);
+try {
+Connection conn = getConnection();
+Network nw = findOrCreateTunnelNetwork(conn, cmd.getBridgeName());
+cleanUpTmpDomVif(conn, nw);
+destroyTunnelNetwork(conn, nw, cmd.getHostId());
+s_logger.debug("OVS Bridge destroyed");
+return new Answer(cmd, true, null);
+} catch (Exception e) {
+

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

[talluri]

1. list* calls are modified to take listall=True when
account and domainid is passed to conform to recent IAM
related changes in 4.4-forward
2. fixed typo passd to passwd in cloudstackTestClient.py
3. added few missing data required for tests in test_data.py
4. removed config.cfg

mend

Conflicts:
tools/marvin/marvin/config/test_data.py
tools/marvin/marvin/lib/base.py


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

Branch: refs/heads/master
Commit: c42e9036f723e39993134cabc6cce75d68503249
Parents: 63f6888
Author: SrikanteswaraRao Talluri 
Authored: Thu May 1 23:14:34 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Wed May 14 18:14:09 2014 +0530

--
 tools/marvin/marvin/cloudstackTestClient.py |   2 +-
 tools/marvin/marvin/config/config.cfg   | 457 -
 tools/marvin/marvin/config/test_data.py | 107 -
 tools/marvin/marvin/lib/base.py | 502 ---
 tools/marvin/marvin/lib/common.py   |  66 +++
 5 files changed, 516 insertions(+), 618 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c42e9036/tools/marvin/marvin/cloudstackTestClient.py
--
diff --git a/tools/marvin/marvin/cloudstackTestClient.py 
b/tools/marvin/marvin/cloudstackTestClient.py
index 13d920e..2e9b49a 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -190,7 +190,7 @@ class CSTestClient(object):
 else self.__dbSvrDetails.port
 user = "cloud" if self.__dbSvrDetails.user is None \
 else self.__dbSvrDetails.user
-passwd = 'cloud' if self.__dbSvrDetails.passd is None \
+passwd = 'cloud' if self.__dbSvrDetails.passwd is None \
 else self.__dbSvrDetails.passd
 db = 'cloud' if self.__dbSvrDetails.db is None \
 else self.__dbSvrDetails.db

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c42e9036/tools/marvin/marvin/config/config.cfg
--
diff --git a/tools/marvin/marvin/config/config.cfg 
b/tools/marvin/marvin/config/config.cfg
deleted file mode 100644
index a4bbe9d..000
--- a/tools/marvin/marvin/config/config.cfg
+++ /dev/null
@@ -1,457 +0,0 @@
-# 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.
-#
-# Use the common configs added such as account, network_offerings, domain, 
project,
-# or add your own data if required separately for any test case
-{
-"domain":
-{
-"name": "domain"
-}
-  ,
-"project":
-  {
-"name": "Project",
-"displaytext": "Test project"
-   },
-"account": {
-"email": "test-acco...@test.com",
-"firstname": "test",
-"lastname": "test",
-"username": "test-account",
-"password": "password"
-},
-"user": {
-"email": "u...@test.com",
-"firstname": "User",
-"lastname": "User",
-"username": "User",
-# Random characters are appended for unique
-# username
-"password": "fr3sca",
-},
-"service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 128
-},
-"isolated_network_offering": {
-  "name": "Isolated Network offering",

git commit: updated refs/heads/4.4 to 13ba59c

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 866e73df6 -> 13ba59c5f


CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce.


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

Branch: refs/heads/4.4
Commit: 13ba59c5f0b5e5007981c1705110d4e9387aca4f
Parents: 866e73d
Author: Sanjay Tripathi 
Authored: Tue May 13 15:00:11 2014 +0530
Committer: Daan Hoogland 
Committed: Wed May 14 13:52:46 2014 +0200

--
 api/src/com/cloud/agent/api/VgpuTypesInfo.java  |  8 ++-
 api/src/com/cloud/capacity/Capacity.java|  1 +
 .../cloudstack/api/response/HostResponse.java   |  1 +
 .../src/com/cloud/gpu/dao/HostGpuGroupsDao.java |  2 +-
 .../src/com/cloud/gpu/dao/VGPUTypesDao.java | 47 ++---
 .../src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 54 +++-
 .../src/com/cloud/vm/dao/VMInstanceDao.java |  3 ++
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 46 +
 .../xen/resource/XenServer620SP1Resource.java   |  2 +-
 server/src/com/cloud/api/ApiDBUtils.java| 10 
 server/src/com/cloud/api/ApiResponseHelper.java | 40 +++
 ui/scripts/sharedFunctions.js   |  2 +
 ui/scripts/ui-custom/zoneChart.js   |  3 ++
 13 files changed, 195 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13ba59c5/api/src/com/cloud/agent/api/VgpuTypesInfo.java
--
diff --git a/api/src/com/cloud/agent/api/VgpuTypesInfo.java 
b/api/src/com/cloud/agent/api/VgpuTypesInfo.java
index ed54c5a..85ffc18 100644
--- a/api/src/com/cloud/agent/api/VgpuTypesInfo.java
+++ b/api/src/com/cloud/agent/api/VgpuTypesInfo.java
@@ -18,6 +18,7 @@ package com.cloud.agent.api;
 public class VgpuTypesInfo {
 
 private String modelName;
+private String groupName;
 private Long maxHeads;
 private Long videoRam;
 private Long maxResolutionX;
@@ -30,6 +31,10 @@ public class VgpuTypesInfo {
 return modelName;
 }
 
+public String getGroupName() {
+return groupName;
+}
+
 public Long getVideoRam() {
 return videoRam;
 }
@@ -66,8 +71,9 @@ public class VgpuTypesInfo {
 this.maxCapacity = maxCapacity;
 }
 
-public VgpuTypesInfo(String modelName, Long videoRam, Long maxHeads, Long 
maxResolutionX, Long maxResolutionY, Long maxVgpuPerGpu,
+public VgpuTypesInfo(String groupName, String modelName, Long videoRam, 
Long maxHeads, Long maxResolutionX, Long maxResolutionY, Long maxVgpuPerGpu,
 Long remainingCapacity, Long maxCapacity) {
+this.groupName = groupName;
 this.modelName = modelName;
 this.videoRam = videoRam;
 this.maxHeads = maxHeads;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13ba59c5/api/src/com/cloud/capacity/Capacity.java
--
diff --git a/api/src/com/cloud/capacity/Capacity.java 
b/api/src/com/cloud/capacity/Capacity.java
index c1c5d8f..2fbc1d6 100755
--- a/api/src/com/cloud/capacity/Capacity.java
+++ b/api/src/com/cloud/capacity/Capacity.java
@@ -30,6 +30,7 @@ public interface Capacity extends InternalIdentity, Identity {
 public static final short CAPACITY_TYPE_VLAN = 7;
 public static final short CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP = 8;
 public static final short CAPACITY_TYPE_LOCAL_STORAGE = 9;
+public static final short CAPACITY_TYPE_GPU = 19;
 
 public Long getHostOrPoolId();
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13ba59c5/api/src/org/apache/cloudstack/api/response/HostResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java 
b/api/src/org/apache/cloudstack/api/response/HostResponse.java
index 008631f..d7638de 100644
--- a/api/src/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HostResponse.java
@@ -328,6 +328,7 @@ public class HostResponse extends BaseResponse {
 public void setGpuGroups(List gpuGroup) {
 this.gpuGroup = gpuGroup;
 }
+
 public void setDiskSizeTotal(Long diskSizeTotal) {
 this.diskSizeTotal = diskSizeTotal;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13ba59c5/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDao.java
--
diff --git a/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDao.java 
b/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDao.java

git commit: updated refs/heads/master to 24bf1c5

[talluri]

Repository: cloudstack
Updated Branches:
  refs/heads/master c42e9036f -> 24bf1c56d


Added few exception changes,test suite name generation for information 
collected post run, fixed pep8 issues

Signed-off-by: santhoshe 

Conflicts:
tools/marvin/marvin/marvinInit.py


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

Branch: refs/heads/master
Commit: 24bf1c56dfe437766a716dc8ced6d892782bd6a1
Parents: c42e903
Author: santhoshe 
Authored: Mon May 5 16:40:58 2014 +1000
Committer: SrikanteswaraRao Talluri 
Committed: Wed May 14 18:34:27 2014 +0530

--
 tools/marvin/marvin/cloudstackConnection.py | 52 +++-
 tools/marvin/marvin/cloudstackTestClient.py |  4 +-
 tools/marvin/marvin/configGenerator.py  |  3 +-
 tools/marvin/marvin/marvinInit.py   |  3 +-
 tools/marvin/marvin/marvinLog.py|  2 +-
 tools/marvin/marvin/marvinPlugin.py | 26 ++--
 6 files changed, 54 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24bf1c56/tools/marvin/marvin/cloudstackConnection.py
--
diff --git a/tools/marvin/marvin/cloudstackConnection.py 
b/tools/marvin/marvin/cloudstackConnection.py
index caa8609..8044da7 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -38,7 +38,9 @@ from requests import (
 Timeout,
 RequestException
 )
-from marvin.cloudstackException import GetDetailExceptionInfo
+from marvin.cloudstackException import (
+InvalidParameterException,
+GetDetailExceptionInfo)
 
 
 class CSConnection(object):
@@ -235,6 +237,7 @@ class CSConnection(object):
 self.logger.exception("__sendCmdToCS: Invalid Protocol")
 return FAILED
 except Exception as e:
+self.__lastError = e
 self.logger.exception("__sendCmdToCS: Exception:%s" %
   GetDetailExceptionInfo(e))
 return FAILED
@@ -265,6 +268,8 @@ class CSConnection(object):
 if payload[required_param] is None:
 self.logger.debug("CmdName: %s Parameter : %s is Required"
   % (cmd_name, required_param))
+self.__lastError = InvalidParameterException(
+"Invalid Parameters")
 return FAILED
 for param, value in payload.items():
 if value is None:
@@ -284,6 +289,7 @@ class CSConnection(object):
 i += 1
 return cmd_name.strip(), isAsync, payload
 except Exception as e:
+self.__lastError = e
 self.logger.\
 exception("__sanitizeCmd: CmdName : "
   "%s : Exception:%s" % (cmd_name,
@@ -301,21 +307,29 @@ class CSConnection(object):
 @Output:Response output from CS
 '''
 try:
-ret = jsonHelper.getResultObj(cmd_response.json(), response_cls)
-except TypeError:
-ret = jsonHelper.getResultObj(cmd_response.json, response_cls)
+try:
+ret = jsonHelper.getResultObj(
+cmd_response.json(),
+response_cls)
+except TypeError:
+ret = jsonHelper.getResultObj(cmd_response.json, response_cls)
 
-'''
-If the response is asynchronous, poll and return response
-else return response as it is
-'''
-if is_async == "false":
-self.logger.debug("Response : %s" % str(ret))
-return ret
-else:
-response = self.__poll(ret.jobid, response_cls)
-self.logger.debug("Response : %s" % str(response))
-return response.jobresult if response != FAILED else FAILED
+'''
+If the response is asynchronous, poll and return response
+else return response as it is
+'''
+if is_async == "false":
+self.logger.debug("Response : %s" % str(ret))
+return ret
+else:
+response = self.__poll(ret.jobid, response_cls)
+self.logger.debug("Response : %s" % str(response))
+return response.jobresult if response != FAILED else FAILED
+except Exception as e:
+self.__lastError = e
+self.logger.\
+exception("Exception:%s" % GetDetailExceptionInfo(e))
+return FAILED
 
 def marvinRequest(self, cmd, response_type=

git commit: updated refs/heads/4.4-forward to 9106cfb

[talluri]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 4c01d81d8 -> 9106cfb4b


Revert "CLOUDSTACK-5674: Fixed cloudstackConnection.py to return FAILED in case 
of well handled exceptions returning from server having jobresultcode as 530"

This reverts commit aaa2f5932ba8f7d3ef08ad5176744811589176f5.


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

Branch: refs/heads/4.4-forward
Commit: 9106cfb4be7d157cc4574e4dcfeb61d3792cc673
Parents: 4c01d81
Author: SrikanteswaraRao Talluri 
Authored: Wed May 14 18:45:01 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Wed May 14 18:45:01 2014 +0530

--
 tools/marvin/marvin/cloudstackConnection.py | 24 ++--
 tools/marvin/marvin/codes.py|  2 --
 2 files changed, 14 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9106cfb4/tools/marvin/marvin/cloudstackConnection.py
--
diff --git a/tools/marvin/marvin/cloudstackConnection.py 
b/tools/marvin/marvin/cloudstackConnection.py
index 1ff8381..8044da7 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -21,18 +21,26 @@ import base64
 import hmac
 import hashlib
 import time
-from cloudstackAPI import queryAsyncJobResult
+from cloudstackAPI import *
 import jsonHelper
 from marvin.codes import (
 FAILED,
+INVALID_RESPONSE,
+INVALID_INPUT,
 JOB_FAILED,
+JOB_INPROGRESS,
 JOB_CANCELLED,
-JOB_SUCCEEDED,
-JOB_NO_EXCEPTION,
-JOB_EXCEPTION_OCCURED
+JOB_SUCCEEDED
 )
-from marvin.cloudstackException import (GetDetailExceptionInfo,
-InvalidParameterException)
+from requests import (
+ConnectionError,
+HTTPError,
+Timeout,
+RequestException
+)
+from marvin.cloudstackException import (
+InvalidParameterException,
+GetDetailExceptionInfo)
 
 
 class CSConnection(object):
@@ -92,7 +100,6 @@ class CSConnection(object):
 start_time = time.time()
 end_time = time.time()
 async_response = FAILED
-jobresultcode = JOB_NO_EXCEPTION
 self.logger.debug("=== Jobid: %s Started ===" % (str(jobid)))
 while timeout > 0:
 async_response = self.\
@@ -102,7 +109,6 @@ class CSConnection(object):
 if job_status in [JOB_FAILED,
   JOB_CANCELLED,
   JOB_SUCCEEDED]:
-jobresultcode = async_response.jobresultcode
 break
 time.sleep(5)
 timeout -= 5
@@ -116,8 +122,6 @@ class CSConnection(object):
 "TotalTime:%s===" %
 (str(jobid), str(time.ctime(start_time)),
  str(time.ctime(end_time)), str(tot_time)))
-if jobresultcode == JOB_EXCEPTION_OCCURED:
-async_response = FAILED
 return async_response
 except Exception as e:
 self.__lastError = e

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9106cfb4/tools/marvin/marvin/codes.py
--
diff --git a/tools/marvin/marvin/codes.py b/tools/marvin/marvin/codes.py
index 0619374..ef49c0c 100644
--- a/tools/marvin/marvin/codes.py
+++ b/tools/marvin/marvin/codes.py
@@ -60,8 +60,6 @@ JOB_INPROGRESS = 0
 JOB_SUCCEEDED = 1
 JOB_FAILED = 2
 JOB_CANCELLED = 3
-JOB_EXCEPTION_OCCURED = 530
-JOB_NO_EXCEPTION = 0
 '''
 User Related Codes
 '''

git commit: updated refs/heads/4.4-forward to 9e21b8b

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 9106cfb4b -> 9e21b8b04


releasing dhcp leases on vpcs failes because the network tier of the tennant 
aren't behinbd eth0. Here we make interface selection dynamic.

Signed-off-by: Daan Hoogland 


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

Branch: refs/heads/4.4-forward
Commit: 9e21b8b04e6affa254bf88d1fdaa9c4da7f9bf05
Parents: 9106cfb
Author: Joris van Lieshout 
Authored: Wed May 14 12:05:36 2014 +0200
Committer: Daan Hoogland 
Committed: Wed May 14 16:13:57 2014 +0200

--
 systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e21b8b0/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
--
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh 
b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
index 70c95a8..c1046c6 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
@@ -99,7 +99,7 @@ if [ $dnsmasq_managed_lease ]
 then
   #release previous dhcp lease if present
   logger -t cloud "edithosts: releasing $ipv4"
-  dhcp_release eth0 $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > 
/dev/null 2>&1
+  dhcp_release $(ip route get "$ipv4/32" | tr " " "\n" | grep eth) $ipv4 
$(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
   logger -t cloud "edithosts: released $ipv4"
 fi
 

git commit: Small tweaks for the RN

[sebgoa]

Repository: cloudstack-docs-rn
Updated Branches:
  refs/heads/master c7f17818d -> 606f16e76


Small tweaks for the RN


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

Branch: refs/heads/master
Commit: 606f16e76b3e77a09684f44dc99641660da4a7b8
Parents: c7f1781
Author: Sebastien Goasguen 
Authored: Wed May 14 09:45:06 2014 +0200
Committer: Sebastien Goasguen 
Committed: Wed May 14 09:45:06 2014 +0200

--
 source/_static/images/acslogo.png | Bin 0 -> 135394 bytes
 source/compat.rst |  16 +++-
 source/index.rst  |  12 +---
 3 files changed, 16 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/606f16e7/source/_static/images/acslogo.png
--
diff --git a/source/_static/images/acslogo.png 
b/source/_static/images/acslogo.png
new file mode 100644
index 000..a938231
Binary files /dev/null and b/source/_static/images/acslogo.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/606f16e7/source/compat.rst
--
diff --git a/source/compat.rst b/source/compat.rst
index 149d09e..a96886f 100644
--- a/source/compat.rst
+++ b/source/compat.rst
@@ -19,10 +19,16 @@ Compatibility Matrix
 Supported OS Versions for Management Server
 ---
 
-This section lists the operating systems that are supported for running
-CloudStack Management Server. Note that specific versions of the
-operating systems are tested, so compatibility with CentOS 6.3 may not
-indicate compatibility with CentOS 6.2, 6.1 and so on.
+This section describes the operating systems, browsers, and hypervisors
+that have been newly tested and certified compatible with CloudStack
+|version|. Most earlier OS and hypervisor versions are also still supported
+for use with |version|. It might work well on other platforms, but the
+platforms listed below are the ones that are specifically tested against
+and are more likely to be able to help troubleshoot if you run into any
+issues.
+
+.. note:: that specific versions of the operating systems are tested, so 
compatibility with CentOS 6.3 may not
+  indicate compatibility with CentOS 6.2, 6.1 and so on.
 
 -  
 
@@ -133,4 +139,4 @@ best results, one of the following browsers recommended:
 
 -  
 
-   Safari 5
\ No newline at end of file
+   Safari 5

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/606f16e7/source/index.rst
--
diff --git a/source/index.rst b/source/index.rst
index 3d97ad7..094ea01 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -21,13 +21,11 @@
 Welcome to Apache CloudStack Release Notes
 ==
 
-This section describes the operating systems, browsers, and hypervisors
-that have been newly tested and certified compatible with CloudStack
-|version|. Most earlier OS and hypervisor versions are also still supported
-for use with |version| It might work well on other platforms, but the
-platforms listed below are the ones that are specifically tested against
-and are more likely to be able to help troubleshoot if you run into any
-issues.
+.. figure:: /_static/images/acslogo.png
+:align: center
+
+.. warning:: We are in the process of changing documentation format as well as 
hosting mechanism.
+ Please be patient with us as we migrate our entire documentation 
to this new setup.
 
 This document contains information specific to this release of CloudStack, 
including upgrade instructions from prior releases, new
 features added to CloudStack, API changes, and issues fixed in the release. 
For installation instructions, please see the `Installation

git commit: updated refs/heads/4.4-forward to 4c01d81

[muralireddy]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward e7e1ae254 -> 4c01d81d8


CLOUDSTACK-6668: OVS distributed routing: ensure bridge is deleted when
last VM from the VPC is deleted on a host

OVS distributed routing: ensure bridge is deleted when last VM from the
VPC is deleted on a host. This fix ensures that bridge is
destroyed.


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

Branch: refs/heads/4.4-forward
Commit: 4c01d81d80ef8541ba0976c3beee9d7180da883b
Parents: e7e1ae2
Author: Murali Reddy 
Authored: Wed May 14 16:38:17 2014 +0530
Committer: Murali Reddy 
Committed: Wed May 14 16:39:55 2014 +0530

--
 .../xen/resource/CitrixResourceBase.java| 36 
 .../agent/api/OvsDestroyBridgeCommand.java  |  8 +-
 .../network/ovs/OvsNetworkTopologyGuru.java |  2 +-
 .../network/ovs/OvsNetworkTopologyGuruImpl.java | 10 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java | 96 +++-
 .../xenserver/cloudstack_pluginlib.py   | 12 ++-
 scripts/vm/hypervisor/xenserver/ovstunnel   | 27 --
 7 files changed, 111 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c01d81d/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 2b6fb11..93feb07 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
@@ -990,6 +990,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 Network.Record rec = new Network.Record();
 Set networks = Network.getByNameLabel(conn, nwName);
 
+
 if (networks.size() == 0) {
 rec.nameDescription = "tunnel network id# " + nwName;
 rec.nameLabel = nwName;
@@ -1064,11 +1065,11 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 }
 
-private synchronized void destroyTunnelNetwork(Connection conn, String 
bridgeName) {
+private synchronized void destroyTunnelNetwork(Connection conn, Network 
nw, long hostId) {
 try {
-Network nw = findOrCreateTunnelNetwork(conn, bridgeName);
 String bridge = nw.getBridge(conn);
-String result = callHostPlugin(conn, "ovstunnel", 
"destroy_ovs_bridge", "bridge", bridge);
+String result = callHostPlugin(conn, "ovstunnel", 
"destroy_ovs_bridge", "bridge", bridge,
+"cs_host_id", ((Long)hostId).toString());
 String[] res = result.split(":");
 if (res.length != 2 || !res[0].equalsIgnoreCase("SUCCESS")) {
 //TODO: Should make this error not fatal?
@@ -1677,14 +1678,12 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 return cmd;
 }
 
-private void cleanUpTmpDomVif(Connection conn, Network nw) {
-List vifs;
-synchronized (_tmpDom0Vif) {
-vifs = _tmpDom0Vif;
-_tmpDom0Vif = new ArrayList();
-}
+private void cleanUpTmpDomVif(Connection conn, Network nw) throws 
XenAPIException, XmlRpcException {
 
-for (VIF v : vifs) {
+Pair vm = getControlDomain(conn);
+VM dom0 = vm.first();
+Set dom0Vifs = dom0.getVIFs(conn);
+for (VIF v : dom0Vifs) {
 String vifName = "unknown";
 try {
 VIF.Record vifr = v.getRecord(conn);
@@ -5273,12 +5272,17 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 
 private Answer execute(OvsDestroyBridgeCommand cmd) {
-Connection conn = getConnection();
-Network nw = findOrCreateTunnelNetwork(conn, cmd.getBridgeName());
-cleanUpTmpDomVif(conn, nw);
-destroyTunnelNetwork(conn, cmd.getBridgeName());
-s_logger.debug("OVS Bridge destroyed");
-return new Answer(cmd, true, null);
+try {
+Connection conn = getConnection();
+Network nw = findOrCreateTunnelNetwork(conn, cmd.getBridgeName());
+cleanUpTmpDomVif(conn, nw);
+destroyTunnelNetwork(conn, nw, cmd.getHostId());
+s_logger.debug("OVS Bridge destroyed");
+return new Answer(cmd, true, null);
+} catch (Except

git commit: updated refs/heads/master to 2ebeec4

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master 24bf1c56d -> 2ebeec433


releasing dhcp leases on vpcs failes because the network tier of the tennant 
aren't behinbd eth0. Here we make interface selection dynamic.

Signed-off-by: Daan Hoogland 


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

Branch: refs/heads/master
Commit: 2ebeec43340f33e2a00553b171452c6516ccc946
Parents: 24bf1c5
Author: Joris van Lieshout 
Authored: Wed May 14 12:05:36 2014 +0200
Committer: Daan Hoogland 
Committed: Wed May 14 16:11:03 2014 +0200

--
 systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ebeec43/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
--
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh 
b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
index 70c95a8..c1046c6 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
@@ -99,7 +99,7 @@ if [ $dnsmasq_managed_lease ]
 then
   #release previous dhcp lease if present
   logger -t cloud "edithosts: releasing $ipv4"
-  dhcp_release eth0 $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > 
/dev/null 2>&1
+  dhcp_release $(ip route get "$ipv4/32" | tr " " "\n" | grep eth) $ipv4 
$(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
   logger -t cloud "edithosts: released $ipv4"
 fi
 

[1/4] git commit: updated refs/heads/4.4-forward-iam-disabled to c9c7c8c

[mchen]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward-iam-disabled d32f5c70d -> c9c7c8cb4


Bring back same owner check interface in AccountService.

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

Branch: refs/heads/4.4-forward-iam-disabled
Commit: 3c1fbb43fbf5601acc522d058077f59d66e4816c
Parents: d32f5c7
Author: Min Chen 
Authored: Wed May 14 10:21:46 2014 -0700
Committer: Min Chen 
Committed: Wed May 14 10:21:46 2014 -0700

--
 api/src/com/cloud/user/AccountService.java  |  12 +-
 .../apache/cloudstack/acl/SecurityChecker.java  |   6 +-
 .../command/user/nat/DisableStaticNatCmd.java   |   5 +-
 .../command/user/nat/EnableStaticNatCmd.java|   3 +-
 .../command/user/volume/AttachVolumeCmd.java|   4 +-
 .../contrail/management/MockAccountManager.java |  11 ++
 server/src/com/cloud/acl/DomainChecker.java |  12 --
 server/src/com/cloud/api/ApiDispatcher.java |  22 +++
 .../cloud/api/dispatch/ParamProcessWorker.java  |   6 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |   1 -
 .../src/com/cloud/user/AccountManagerImpl.java  | 141 ++-
 .../com/cloud/user/MockAccountManagerImpl.java  |   9 ++
 .../iam/RoleBasedEntityAccessChecker.java   |  19 ++-
 13 files changed, 145 insertions(+), 106 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c1fbb43/api/src/com/cloud/user/AccountService.java
--
diff --git a/api/src/com/cloud/user/AccountService.java 
b/api/src/com/cloud/user/AccountService.java
index 6cc86cd..52ce761 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -103,11 +103,17 @@ public interface AccountService {
 
 RoleType getRoleType(Account account);
 
-void checkAccess(Account caller, Domain domain) throws 
PermissionDeniedException;
+void checkAccess(Account account, Domain domain) throws 
PermissionDeniedException;
 
-void checkAccess(Account caller, AccessType accessType, 
ControlledEntity... entities) throws PermissionDeniedException;
+void checkAccess(Account account, AccessType accessType, 
ControlledEntity... entities) throws PermissionDeniedException;
 
-void checkAccess(Account caller, AccessType accessType, String apiName, 
ControlledEntity... entities) throws PermissionDeniedException;
+void checkAccess(Account account, AccessType accessType, String apiName, 
ControlledEntity... entities) throws PermissionDeniedException;
+
+// TODO: the following two interfaces will be deprecated by the above two 
counterparts when securityChecker implementation is in place
+void checkAccess(Account account, AccessType accessType, boolean 
sameOwner, ControlledEntity... entities) throws PermissionDeniedException;
+
+void checkAccess(Account account, AccessType accessType, boolean 
sameOwner, String apiName,
+ControlledEntity... entities) throws PermissionDeniedException;
 
 Long finalyzeAccountId(String accountName, Long domainId, Long projectId, 
boolean enabledOnly);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c1fbb43/api/src/org/apache/cloudstack/acl/SecurityChecker.java
--
diff --git a/api/src/org/apache/cloudstack/acl/SecurityChecker.java 
b/api/src/org/apache/cloudstack/acl/SecurityChecker.java
index 79366bd..4170871 100644
--- a/api/src/org/apache/cloudstack/acl/SecurityChecker.java
+++ b/api/src/org/apache/cloudstack/acl/SecurityChecker.java
@@ -31,10 +31,10 @@ import com.cloud.utils.component.Adapter;
 public interface SecurityChecker extends Adapter {
 
 public enum AccessType {
-ListEntry,
-UseEntry,
-OperateEntry,
 ModifyProject,
+OperateEntry,
+UseEntry,
+ListEntry
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c1fbb43/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java 
b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
index 2a9311e..1df77ec 100644
--- 
a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
@@ -34,11 +34,8 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;

[2/4] Restore same owner check in cmd and service layer.

[mchen]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9c7c8cb/server/test/com/cloud/event/EventControlsUnitTest.java
--
diff --git a/server/test/com/cloud/event/EventControlsUnitTest.java 
b/server/test/com/cloud/event/EventControlsUnitTest.java
index 0dc5742..91dc921 100644
--- a/server/test/com/cloud/event/EventControlsUnitTest.java
+++ b/server/test/com/cloud/event/EventControlsUnitTest.java
@@ -60,7 +60,7 @@ public class EventControlsUnitTest extends TestCase {
 MockitoAnnotations.initMocks(this);
 _mgmtServer._eventDao = _eventDao;
 _mgmtServer._accountMgr = _accountMgr;
-doNothing().when(_accountMgr).checkAccess(any(Account.class), 
any(AccessType.class), any(ControlledEntity.class));
+doNothing().when(_accountMgr).checkAccess(any(Account.class), 
any(AccessType.class), any(Boolean.class), any(ControlledEntity.class));
 when(_eventDao.listToArchiveOrDeleteEvents(anyList(), anyString(), 
any(Date.class), any(Date.class), anyList())).thenReturn(_events);
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9c7c8cb/server/test/com/cloud/user/MockAccountManagerImpl.java
--
diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java 
b/server/test/com/cloud/user/MockAccountManagerImpl.java
index 81db1e4..505708a 100644
--- a/server/test/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/test/com/cloud/user/MockAccountManagerImpl.java
@@ -356,15 +356,5 @@ public class MockAccountManagerImpl extends ManagerBase 
implements Manager, Acco
 return null;
 }
 
-@Override
-public void checkAccess(Account account, AccessType accessType, 
ControlledEntity... entities) throws PermissionDeniedException {
-// TODO Auto-generated method stub
-}
-
-@Override
-public void checkAccess(Account account, AccessType accessType, String 
apiName, ControlledEntity... entities) throws PermissionDeniedException {
-// TODO Auto-generated method stub
-
-}
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9c7c8cb/server/test/com/cloud/vm/UserVmManagerTest.java
--
diff --git a/server/test/com/cloud/vm/UserVmManagerTest.java 
b/server/test/com/cloud/vm/UserVmManagerTest.java
index 927d5e3..b67c164 100755
--- a/server/test/com/cloud/vm/UserVmManagerTest.java
+++ b/server/test/com/cloud/vm/UserVmManagerTest.java
@@ -283,7 +283,7 @@ public class UserVmManagerTest {
 doReturn(3L).when(_volumeMock).getTemplateId();
 doReturn(ImageFormat.VHD).when(_templateMock).getFormat();
 when(_templateDao.findById(anyLong())).thenReturn(_templateMock);
-doNothing().when(_accountMgr).checkAccess(_account, null, 
_templateMock);
+doNothing().when(_accountMgr).checkAccess(_account, null, true, 
_templateMock);
 when(_storageMgr.allocateDuplicateVolume(_volumeMock, 
14L)).thenReturn(_volumeMock);
 when(_templateMock.getGuestOSId()).thenReturn(5L);
 doNothing().when(_vmMock).setGuestOSId(anyLong());
@@ -327,7 +327,7 @@ public class UserVmManagerTest {
 doReturn(3L).when(_vmMock).getIsoId();
 doReturn(ImageFormat.ISO).when(_templateMock).getFormat();
 when(_templateDao.findById(anyLong())).thenReturn(_templateMock);
-doNothing().when(_accountMgr).checkAccess(_account, null, 
_templateMock);
+doNothing().when(_accountMgr).checkAccess(_account, null, true, 
_templateMock);
 when(_storageMgr.allocateDuplicateVolume(_volumeMock, 
null)).thenReturn(_volumeMock);
 doNothing().when(_vmMock).setIsoId(14L);
 when(_templateMock.getGuestOSId()).thenReturn(5L);
@@ -413,7 +413,7 @@ public class UserVmManagerTest {
 
 doReturn(VirtualMachine.State.Running).when(_vmInstance).getState();
 
-doNothing().when(_accountMgr).checkAccess(_account, null, 
_templateMock);
+doNothing().when(_accountMgr).checkAccess(_account, null, true, 
_templateMock);
 
 doNothing().when(_itMgr).checkIfCanUpgrade(_vmMock, _offeringVo);
 
@@ -606,7 +606,7 @@ public class UserVmManagerTest {
 
 when(_accountService.getActiveAccountByName(anyString(), 
anyLong())).thenReturn(newAccount);
 
-doThrow(new PermissionDeniedException("Access check 
failed")).when(_accountMgr).checkAccess(any(Account.class), 
any(AccessType.class),
+doThrow(new PermissionDeniedException("Access check 
failed")).when(_accountMgr).checkAccess(any(Account.class), 
any(AccessType.class), any(Boolean.class),
 any(ControlledEntity.class));
 
 CallContext.register(user, caller);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9c7c8cb/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java
--
diff --git a/server/te

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

[alena1108]

CLOUDSTACK-6675: updatePFRule - retrieve network sync object based on the PF 
rule id that is passed in to the call; not the public ip address


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

Branch: refs/heads/master
Commit: 8d9bdb19b41de3c1f9759afe6c8843c47c0069f1
Parents: 961e2c4
Author: Alena Prokharchyk 
Authored: Wed May 14 12:26:25 2014 -0700
Committer: Alena Prokharchyk 
Committed: Wed May 14 12:34:39 2014 -0700

--
 .../firewall/UpdatePortForwardingRuleCmd.java   | 32 +---
 1 file changed, 14 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d9bdb19/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
 
b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
index 78525ba..eb4d468 100644
--- 
a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
@@ -16,8 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.firewall;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
@@ -27,10 +25,10 @@ import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.FirewallRuleResponse;
 import org.apache.cloudstack.api.response.IPAddressResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.log4j.Logger;
 
 import com.cloud.event.EventTypes;
 import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.network.IpAddress;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.PortForwardingRule;
 import com.cloud.user.Account;
@@ -94,10 +92,6 @@ public class UpdatePortForwardingRuleCmd extends 
BaseAsyncCustomIdCmd {
 return protocol;
 }
 
-public Long getPublicIpId() {
-return publicIpId;
-}
-
 public String getPublicPort() {
 return publicPort;
 }
@@ -109,11 +103,16 @@ public class UpdatePortForwardingRuleCmd extends 
BaseAsyncCustomIdCmd {
 public Boolean getDisplay() {
 return display;
 }
+public Long getId() {
+return id;
+}
 
 /
 /// API Implementation///
 /
 
+
+
 @Override
 public String getCommandName() {
 return s_name;
@@ -121,9 +120,9 @@ public class UpdatePortForwardingRuleCmd extends 
BaseAsyncCustomIdCmd {
 
 @Override
 public long getEntityOwnerId() {
-IpAddress addr = _entityMgr.findById(IpAddress.class, getPublicIpId());
-if (addr != null) {
-return addr.getAccountId();
+PortForwardingRule rule = 
_entityMgr.findById(PortForwardingRule.class, getId());
+if (rule != null) {
+return rule.getAccountId();
 }
 
 // bad address given, parent this command to SYSTEM so ERROR events 
are tracked
@@ -173,14 +172,11 @@ public class UpdatePortForwardingRuleCmd extends 
BaseAsyncCustomIdCmd {
 
 @Override
 public Long getSyncObjId() {
-return getIp().getAssociatedWithNetworkId();
-}
-
-private IpAddress getIp() {
-IpAddress ip = _networkService.getIp(publicIpId);
-if (ip == null) {
-throw new InvalidParameterValueException("Unable to find ip 
address by id " + publicIpId);
+PortForwardingRule rule = 
_entityMgr.findById(PortForwardingRule.class, getId());
+if (rule != null) {
+return rule.getNetworkId();
+} else {
+throw new InvalidParameterValueException("Unable to find the rule 
by id");
 }
-return ip;
 }
 }

git commit: updated refs/heads/4.4-forward to 5949e33

[nitin]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 8f37841eb -> 5949e3357


CLOUDSTACK-6358: As a part of supporting dynamic guest OS defined by user, 
removing the hard-coded dependencies.
This patch is for KVM

1. Local testing on KVM
2. Successfully got up system VMs
3. Successfully created a CentOS VM
4. Snapshots are not supported for KVM

 Signed off by :- Nitin Mehta


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

Branch: refs/heads/4.4-forward
Commit: 5949e33578a886061b18510cf5cfbd8c2b4e4c3b
Parents: 8f37841
Author: Amogh Vasekar 
Authored: Wed May 7 15:16:55 2014 -0700
Committer: Nitin Mehta 
Committed: Wed May 7 15:17:47 2014 -0700

--
 .../storage/dao/GuestOSHypervisorDaoImpl.java   |   6 +-
 .../kvm/resource/LibvirtComputingResource.java  | 156 ++-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |   9 ++
 .../hypervisor/kvm/resource/VifDriverBase.java  |   4 +-
 server/src/com/cloud/hypervisor/KVMGuru.java|  14 +-
 5 files changed, 108 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5949e335/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
--
diff --git 
a/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java 
b/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
index 3b05120..b06cdfa 100644
--- a/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
@@ -58,9 +58,13 @@ public class GuestOSHypervisorDaoImpl extends 
GenericDaoBase sc = mappingSearch.create();
+String version = "default";
+if (!(hypervisorVersion == null || hypervisorVersion.isEmpty())) {
+version = hypervisorVersion;
+}
 sc.setParameters("guest_os_id", guestOsId);
 sc.setParameters("hypervisor_type", hypervisorType);
-sc.setParameters("hypervisor_version", hypervisorVersion);
+sc.setParameters("hypervisor_version", version);
 return findOneBy(sc);
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5949e335/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
--
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 345a8ee..b8f33e5 100755
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -16,12 +16,79 @@
 // under the License.
 package com.cloud.hypervisor.kvm.resource;
 
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.ejb.Local;
+import javax.naming.ConfigurationException;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+import org.libvirt.Connect;
+import org.libvirt.Domain;
+import org.libvirt.DomainBlockStats;
+import org.libvirt.DomainInfo;
+import org.libvirt.DomainInterfaceStats;
+import org.libvirt.DomainSnapshot;
+import org.libvirt.LibvirtException;
+import o

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

[muralireddy]

CLOUDSTACK-6609: OVS distributed routing: ensure tunnels are created if
not created already when OvsVpcPhysicalTopologyConfigCommand update is
recived

Currently if the tunnel creation fails, there is no retry logic. Fix
ensures OvsVpcPhysicalTopologyConfigCommand updates as an opputiunity to ensure
proper tunnels are established between the hosts.


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

Branch: refs/heads/master
Commit: 55111e22844379f542c5075335cba6bd456766d0
Parents: 2a175a2
Author: Murali Reddy 
Authored: Thu May 8 15:48:22 2014 +0530
Committer: Murali Reddy 
Committed: Thu May 8 15:58:16 2014 +0530

--
 .../cloud/network/ovs/OvsTunnelManagerImpl.java |  32 +++-
 .../ovs/dao/VpcDistributedRouterSeqNoVO.java|  23 ++-
 .../xenserver/cloudstack_pluginlib.py   | 155 +--
 scripts/vm/hypervisor/xenserver/ovstunnel   | 139 ++---
 setup/db/db/schema-430to440.sql |   3 +-
 5 files changed, 203 insertions(+), 149 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55111e22/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
--
diff --git 
a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
 
b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index 6fd7d6d..2405f87 100644
--- 
a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ 
b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -710,7 +710,7 @@ public class OvsTunnelManagerImpl extends ManagerBase 
implements OvsTunnelManage
 String bridgeName=generateBridgeNameForVpc(vpcId);
 
 OvsVpcPhysicalTopologyConfigCommand topologyConfigCommand = 
prepareVpcTopologyUpdate(vpcId);
-
topologyConfigCommand.setSequenceNumber(getNextSequenceNumber(vpcId));
+
topologyConfigCommand.setSequenceNumber(getNextTopologyUpdateSequenceNumber(vpcId));
 
 // send topology change update to VPC spanned hosts
 for (Long id: vpcSpannedHostIds) {
@@ -820,7 +820,7 @@ public class OvsTunnelManagerImpl extends ManagerBase 
implements OvsTunnelManage
 if (network.getVpcId() != null && 
isVpcEnabledForDistributedRouter(network.getVpcId())) {
 long vpcId = network.getVpcId();
 OvsVpcRoutingPolicyConfigCommand cmd = 
prepareVpcRoutingPolicyUpdate(vpcId);
-cmd.setSequenceNumber(getNextSequenceNumber(vpcId));
+
cmd.setSequenceNumber(getNextRoutingPolicyUpdateSequenceNumber(vpcId));
 
 // get the list of hosts on which VPC spans (i.e hosts 
that need to be aware of VPC
 // network ACL update)
@@ -901,7 +901,7 @@ public class OvsTunnelManagerImpl extends ManagerBase 
implements OvsTunnelManage
 }
 }
 
-private long getNextSequenceNumber(final long vpcId) {
+private long getNextTopologyUpdateSequenceNumber(final long vpcId) {
 
 try {
 return  Transaction.execute(new TransactionCallback() {
@@ -913,9 +913,31 @@ public class OvsTunnelManagerImpl extends ManagerBase 
implements OvsTunnelManage
 _vpcDrSeqNoDao.persist(seqVo);
 }
 seqVo = _vpcDrSeqNoDao.lockRow(seqVo.getId(), true);
-seqVo.incrSequenceNo();
+seqVo.incrTopologyUpdateSequenceNo();
 _vpcDrSeqNoDao.update(seqVo.getId(), seqVo);
-return seqVo.getSequenceNo();
+return seqVo.getTopologyUpdateSequenceNo();
+}
+});
+} finally {
+
+}
+}
+
+private long getNextRoutingPolicyUpdateSequenceNumber(final long vpcId) {
+
+try {
+return  Transaction.execute(new TransactionCallback() {
+@Override
+public Long doInTransaction(TransactionStatus status) {
+VpcDistributedRouterSeqNoVO seqVo = 
_vpcDrSeqNoDao.findByVpcId(vpcId);
+if (seqVo == null) {
+seqVo = new VpcDistributedRouterSeqNoVO(vpcId);
+_vpcDrSeqNoDao.persist(seqVo);
+}
+seqVo = _vpcDrSeqNoDao.lockRow(seqVo.getId(), true);
+seqVo.incrPolicyUpdateSequenceNo();
+_vpcDrSeqNoDao.update(seqVo.getId(), seqVo);
+return seqVo.getPolicyUpdateSeq

git commit: updated refs/heads/4.4 to 4c9bf8a

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 5a84654d1 -> 4c9bf8a70


CLOUDSTACK-6595: call expunge method marked with @ActionEvent from expunge 
thread context. So the action even EXPUNGE.VM is generated when vm is expunged 
by the thread.


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

Branch: refs/heads/4.4
Commit: 4c9bf8a70f6bec881d2d34afe498012e6b871b6c
Parents: 5a84654
Author: Alena Prokharchyk 
Authored: Wed May 7 13:44:26 2014 -0700
Committer: Daan Hoogland 
Committed: Wed May 7 23:14:04 2014 +0200

--
 api/src/com/cloud/vm/UserVmService.java  |  3 ---
 .../api/command/admin/vm/ExpungeVMCmd.java   |  2 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java   | 15 ---
 3 files changed, 5 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c9bf8a7/api/src/com/cloud/vm/UserVmService.java
--
diff --git a/api/src/com/cloud/vm/UserVmService.java 
b/api/src/com/cloud/vm/UserVmService.java
index af4e1d3..c0c0335 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -21,7 +21,6 @@ import java.util.Map;
 
 import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
 import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
-import org.apache.cloudstack.api.command.admin.vm.ExpungeVMCmd;
 import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
 import org.apache.cloudstack.api.command.user.vm.AddNicToVMCmd;
 import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
@@ -457,8 +456,6 @@ public interface UserVmService {
 UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws 
ResourceUnavailableException, ConcurrentOperationException, 
ManagementServerException,
 VirtualMachineMigrationException;
 
-UserVm expungeVm(ExpungeVMCmd cmd) throws ResourceUnavailableException, 
ConcurrentOperationException;
-
 UserVm expungeVm(long vmId) throws ResourceUnavailableException, 
ConcurrentOperationException;
 
 /**

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c9bf8a7/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java 
b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
index 40b9bb8..155fcff 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
@@ -106,7 +106,7 @@ public class ExpungeVMCmd extends BaseAsyncCmd {
 public void execute() throws ResourceUnavailableException, 
ConcurrentOperationException {
 CallContext.current().setEventDetails("Vm Id: " + getId());
 try {
-UserVm result = _userVmService.expungeVm(this);
+UserVm result = _userVmService.expungeVm(this.getId());
 
 if (result != null) {
 SuccessResponse response = new 
SuccessResponse(getCommandName());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c9bf8a7/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index b55fb19..f0169eb 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -35,9 +35,6 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -47,7 +44,6 @@ import 
org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
 import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
-import org.apache.cloudstack.api.command.admin.vm.ExpungeVMCmd;
 import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
 import org.apache.cloudstack.api.command.user.vm.AddNicToVMCmd;
 import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
@@ -87,6 +83,8 @@ import org.apache.cloudstack.storage.command.DeleteCommand;
 import org.apache.cloudstack.storage.command.DettachCommand;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStore

git commit: updated refs/heads/master to 00fcd9f

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master 5ba5da369 -> 00fcd9fb2


Added fix for CLOUDSTACK-6548

Signed-off-by: santhosh 
Signed-off-by: Daan Hoogland 

Conflicts:
server/src/com/cloud/network/NetworkServiceImpl.java


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

Branch: refs/heads/master
Commit: 00fcd9fb20009566b61a205c1eec28a65ea574db
Parents: 5ba5da3
Author: santhosh 
Authored: Thu May 8 20:21:09 2014 +1000
Committer: Daan Hoogland 
Committed: Fri May 9 17:14:06 2014 +0200

--
 server/src/com/cloud/network/NetworkServiceImpl.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00fcd9fb/server/src/com/cloud/network/NetworkServiceImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java 
b/server/src/com/cloud/network/NetworkServiceImpl.java
index 6262524..f1e5b2a 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3973,7 +3973,11 @@ public class NetworkServiceImpl extends ManagerBase 
implements  NetworkService {
 //create Guest network
 privateNetwork = 
_networkMgr.createGuestNetwork(ntwkOffFinal.getId(), networkName, displayText, 
gateway, cidr, uriString, null, owner, null, pNtwk,
 pNtwk.getDataCenterId(), ACLType.Account, 
null, vpcId, null, null, true, null);
-s_logger.debug("Created private network " + 
privateNetwork);
+if (privateNetwork != null) {
+s_logger.debug("Successfully created guest network 
" + privateNetwork);
+} else {
+throw new CloudRuntimeException("Creating guest 
network failed");
+}
 } else {
 s_logger.debug("Private network already exists: " + 
privateNetwork);
 //Do not allow multiple private gateways with same 
Vlan within a VPC

git commit: updated refs/heads/4.4-forward to 4466ed1

[girish]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward a7dd5aae5 -> 4466ed1ce


Fixing few issues in Multiple IPs test cases


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

Branch: refs/heads/4.4-forward
Commit: 4466ed1ce18fd5391b2b96fa551c171ae7e09723
Parents: a7dd5aa
Author: Gaurav Aradhye 
Authored: Sat May 10 00:26:46 2014 -0400
Committer: gir...@clogeny.com 
Committed: Sat May 10 00:29:58 2014 -0400

--
 .../component/test_multiple_ips_per_nic.py  | 22 +++-
 tools/marvin/marvin/config/test_data.py | 21 +++
 2 files changed, 33 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4466ed1c/test/integration/component/test_multiple_ips_per_nic.py
--
diff --git a/test/integration/component/test_multiple_ips_per_nic.py 
b/test/integration/component/test_multiple_ips_per_nic.py
index 1b1cd82..2db15e5 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -164,11 +164,11 @@ class TestBasicOperations(cloudstackTestCase):
 cls.services["service_offering"]
 )
 cls._cleanup = [cls.service_offering]
-cls.services["shared_network_offering"]["specifyVlan"] = "True"
-cls.services["shared_network_offering"]["specifyIpRanges"] = "True"
+cls.services["shared_network_offering_all_services"]["specifyVlan"] = 
"True"
+
cls.services["shared_network_offering_all_services"]["specifyIpRanges"] = "True"
 
 cls.shared_network_offering = 
CreateEnabledNetworkOffering(cls.api_client,
-  
cls.services["shared_network_offering"])
+  
cls.services["shared_network_offering_all_services"])
 cls._cleanup.append(cls.shared_network_offering)
 cls.mode = cls.zone.networktype
 if cls.mode.lower() == "advanced":
@@ -464,7 +464,7 @@ class TestBasicOperations(cloudstackTestCase):
 try:
 ipaddress_1 = NIC.addIp(apiclient, id=virtual_machine.nic[0].id)
 except Exception as e:
-self.fail("Failed while adding secondary IP to NIC of vm %s" % 
virtual_machine.id)
+self.fail("Failed while adding secondary IP to NIC of vm %s: %s" % 
(virtual_machine.id, e))
 
 try:
 NIC.list(apiclient, virtualmachineid=virtual_machine.id)
@@ -515,10 +515,11 @@ class TestNetworkRules(cloudstackTestCase):
 cls.services["service_offering"]
 )
 cls._cleanup = [cls.service_offering]
-cls.services["shared_network_offering"]["specifyVlan"] = "True"
-cls.services["shared_network_offering"]["specifyIpRanges"] = "True"
+cls.services["shared_network_offering_all_services"]["specifyVlan"] = 
"True"
+
cls.services["shared_network_offering_all_services"]["specifyIpRanges"] = "True"
 
-cls.shared_network_offering = 
CreateEnabledNetworkOffering(cls.api_client, 
cls.services["shared_network_offering"])
+cls.shared_network_offering = 
CreateEnabledNetworkOffering(cls.api_client,
+
cls.services["shared_network_offering_all_services"])
 cls._cleanup.append(cls.shared_network_offering)
 cls.mode = cls.zone.networktype
 if cls.mode.lower() == "advanced":
@@ -889,10 +890,11 @@ class TestVmNetworkOperations(cloudstackTestCase):
 cls.services["service_offering"]
 )
 cls._cleanup = [cls.service_offering]
-cls.services["shared_network_offering"]["specifyVlan"] = "True"
-cls.services["shared_network_offering"]["specifyIpRanges"] = "True"
+cls.services["shared_network_offering_all_services"]["specifyVlan"] = 
"True"
+
cls.services["shared_network_offering_all_services"]["specifyIpRanges"] = "True"
 
-cls.shared_network_offering = 
CreateEnabledNetworkOffering(cls.api_client, 
cls.services["shared_network_offering"])
+cls.shared_network_offering = 
CreateEnabledNetworkOffering(cls.api_client,
+
cls.services["shared_network_offering_all_services"])
 cls._cleanup.append(cls.shared_network_offering)
 cls.mode = cls.zone.networktype
 

git commit: updated refs/heads/4.4 to 882bf07

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 a3825f126 -> 882bf079f


CLOUDSTACK-3272 Fixing NullPointerException for alerts

Signed-off-by: Daan Hoogland 


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

Branch: refs/heads/4.4
Commit: 882bf079fa1886c9feab0948066a02c1cb6cd86a
Parents: a3825f1
Author: sonal.ojha 
Authored: Thu May 8 12:12:02 2014 +0530
Committer: Daan Hoogland 
Committed: Thu May 8 11:13:05 2014 +0200

--
 server/src/com/cloud/event/AlertGenerator.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/882bf079/server/src/com/cloud/event/AlertGenerator.java
--
diff --git a/server/src/com/cloud/event/AlertGenerator.java 
b/server/src/com/cloud/event/AlertGenerator.java
index 5982eea..fab24f4 100644
--- a/server/src/com/cloud/event/AlertGenerator.java
+++ b/server/src/com/cloud/event/AlertGenerator.java
@@ -59,6 +59,7 @@ public class AlertGenerator {
 void init() {
 s_dcDao = dcDao;
 s_podDao = podDao;
+s_configDao = configDao;
 }
 
 public static void publishAlertOnEventBus(String alertType, long 
dataCenterId, Long podId, String subject, String body) {

git commit: updated refs/heads/master to c0f72b2

[nitin]

Repository: cloudstack
Updated Branches:
  refs/heads/master 3f26eeb6e -> c0f72b25c


CLOUDSTACK-6530: Make Network and Volume implement Displayable interface. 
Iterate over all first class entities in the context to decide the display 
property for event display.


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

Branch: refs/heads/master
Commit: c0f72b25c68927d2a3e469186d982afa9b8de965
Parents: 3f26eeb
Author: Nitin Mehta 
Authored: Thu May 8 15:36:25 2014 -0700
Committer: Nitin Mehta 
Committed: Thu May 8 15:37:20 2014 -0700

--
 api/src/com/cloud/network/Network.java  |  6 ++-
 api/src/com/cloud/network/NetworkProfile.java   |  5 +++
 .../com/cloud/network/rules/FirewallRule.java   |  4 +-
 api/src/com/cloud/storage/Volume.java   |  6 ++-
 .../org/apache/cloudstack/api/BaseAsyncCmd.java | 24 
 api/src/org/apache/cloudstack/api/BaseCmd.java  | 40 +++-
 .../command/user/network/CreateNetworkCmd.java  |  8 
 .../api/command/user/vm/UpdateVMCmd.java| 10 -
 .../api/command/user/vm/UpgradeVMCmd.java   |  5 ---
 .../command/user/volume/CreateVolumeCmd.java|  8 
 .../command/user/volume/DeleteVolumeCmd.java|  5 ---
 .../src/com/cloud/network/dao/NetworkVO.java|  5 +++
 .../schema/src/com/cloud/storage/VolumeVO.java  |  9 +
 .../cloudstack/storage/volume/VolumeObject.java |  5 +++
 14 files changed, 92 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0f72b25/api/src/com/cloud/network/Network.java
--
diff --git a/api/src/com/cloud/network/Network.java 
b/api/src/com/cloud/network/Network.java
index ef3bcdf..885bffe 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
@@ -34,7 +35,7 @@ import com.cloud.utils.fsm.StateObject;
 /**
  * owned by an account.
  */
-public interface Network extends ControlledEntity, StateObject, 
InternalIdentity, Identity, Serializable {
+public interface Network extends ControlledEntity, StateObject, 
InternalIdentity, Identity, Serializable, Displayable {
 
 public enum GuestType {
 Shared, Isolated
@@ -327,8 +328,11 @@ public interface Network extends ControlledEntity, 
StateObject, I
 
 boolean getSpecifyIpRanges();
 
+@Deprecated
 boolean getDisplayNetwork();
 
+boolean isDisplay();
+
 String getGuruName();
 
 /**

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0f72b25/api/src/com/cloud/network/NetworkProfile.java
--
diff --git a/api/src/com/cloud/network/NetworkProfile.java 
b/api/src/com/cloud/network/NetworkProfile.java
index db3cba5..1b806d5 100644
--- a/api/src/com/cloud/network/NetworkProfile.java
+++ b/api/src/com/cloud/network/NetworkProfile.java
@@ -249,6 +249,11 @@ public class NetworkProfile implements Network {
 }
 
 @Override
+public boolean isDisplay(){
+return displayNetwork;
+}
+
+@Override
 public Long getVpcId() {
 return vpcId;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0f72b25/api/src/com/cloud/network/rules/FirewallRule.java
--
diff --git a/api/src/com/cloud/network/rules/FirewallRule.java 
b/api/src/com/cloud/network/rules/FirewallRule.java
index b02257b..4346e2f 100644
--- a/api/src/com/cloud/network/rules/FirewallRule.java
+++ b/api/src/com/cloud/network/rules/FirewallRule.java
@@ -19,10 +19,11 @@ package com.cloud.network.rules;
 import java.util.List;
 
 import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-public interface FirewallRule extends ControlledEntity, Identity, 
InternalIdentity {
+public interface FirewallRule extends ControlledEntity, Identity, 
InternalIdentity, Displayable {
 enum Purpose {
 Firewall, PortForwarding, LoadBalancing, Vpn, StaticNat, NetworkACL,
 }
@@ -87,6 +88,7 @@ public interface FirewallRule extends ControlledEntity, 
Identity, InternalIdenti
  */
 TrafficType getTrafficType();
 
+@Override
 boolean isDisplay();
 
 }

http://git-wip-us.apache.org/repos/asf