git commit: updated refs/heads/master to 0ac2eb4

2014-07-23 Thread sanjeev 
Repository: cloudstack
Updated Branches:
  refs/heads/master c43b56998 -> 0ac2eb4f6


CLOUDSTACK: Static IP address assignment for VM

Signed-off-by: sanjeev 

Incorporated review comments for review request 23614


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

Branch: refs/heads/master
Commit: 0ac2eb4f671841b2525db810940d8502e6a3dcf4
Parents: c43b569
Author: sanjeev 
Authored: Thu Jul 17 16:53:46 2014 +0530
Committer: sanjeev 
Committed: Wed Jul 23 14:14:22 2014 +0530

--
 .../component/test_escalations_instances.py | 115 ++-
 1 file changed, 112 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ac2eb4f/test/integration/component/test_escalations_instances.py
--
diff --git a/test/integration/component/test_escalations_instances.py 
b/test/integration/component/test_escalations_instances.py
index 4900ff6..79fd3b1 100644
--- a/test/integration/component/test_escalations_instances.py
+++ b/test/integration/component/test_escalations_instances.py
@@ -27,7 +27,7 @@ from marvin.lib.utils import checkVolumeSize
 from marvin.codes import SUCCESS
 from nose.plugins.attrib import attr
 from time import sleep
-from ctypes.wintypes import BOOLEAN
+# from ctypes.wintypes import BOOLEAN
 
 class TestListInstances(cloudstackTestCase):
 
@@ -84,7 +84,7 @@ class TestListInstances(cloudstackTestCase):
   cls.api_client,
   account=cls.account.name,
   domainid=cls.domain.id,
-  max=-1,
+  max= -1,
   resourcetype=i
   )
 
@@ -1924,7 +1924,7 @@ class TestInstances(cloudstackTestCase):
   cls.api_client,
   account=cls.account.name,
   domainid=cls.domain.id,
-  max=-1,
+  max= -1,
   resourcetype=i
   )
 cls._cleanup.append(cls.account)
@@ -3458,3 +3458,112 @@ class TestInstances(cloudstackTestCase):
   "Security Groups in VM are not same as created"
   )
 return
+
+@attr(tags=["advanced", "selfservice"])
+def test_24_deploy_vm_with_static_ip_ES1662(self):
+"""
+@Desc: Test to verify deploy VM with static ip address assignment
+@Steps:
+Step1: Create a network for the user
+Step2: List the network and check that it is created for the user
+Step3: Deploy vm with ip address in the above network
+Step4: List the vm and verify the ip address in the response
+"""
+# Listing Network Offerings
+network_offerings_list = NetworkOffering.list(
+  self.apiClient,
+  forvpc="false",
+  guestiptype="Isolated",
+  state="Enabled",
+  
supportedservices="SourceNat",
+  zoneid=self.zone.id
+  )
+status = validateList(network_offerings_list)
+self.assertEquals(
+  PASS,
+  status[0],
+  "Isolated Network Offerings with sourceNat enabled 
are not found"
+  )
+"""
+Create Isolated netwrok with ip range
+"""
+self.services["network"]["startip"] = "10.1.1.2"
+self.services["network"]["endip"] = "10.1.1.254"
+self.services["network"]["gateway"] = "10.1.1.1"
+self.services["network"]["netmask"] = "255.255.255.0"
+vm_ip = "10.1.1.10"
+"""
+Creating isolated/guest network with ip range
+"""
+network = Network.create(
+  self.userapiclient,
+  self.services["network"],
+  accountid=self.account.name,
+  domainid=self.domain.id,
+  
networkofferingid=network_offerings_list[0].id,
+

[1/4] git commit: updated refs/heads/master to 930e4a2

2014-07-23 Thread hugo 
Repository: cloudstack
Updated Branches:
  refs/heads/master 0ac2eb4f6 -> 930e4a2a6


Add empty findbugs exclusion files for the new modules


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

Branch: refs/heads/master
Commit: 930e4a2a6f604df3560c76bd2b38faf75b6a3709
Parents: 628d8e6
Author: Hugo Trippaers 
Authored: Wed Jul 23 11:09:04 2014 +0200
Committer: Hugo Trippaers 
Committed: Wed Jul 23 11:11:18 2014 +0200

--
 .../brocade-vcs/findbugsExcludeFilter.xml   | 25 
 .../nuage-vsp/findbugsExcludeFilter.xml | 25 
 2 files changed, 50 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/930e4a2a/plugins/network-elements/brocade-vcs/findbugsExcludeFilter.xml
--
diff --git a/plugins/network-elements/brocade-vcs/findbugsExcludeFilter.xml 
b/plugins/network-elements/brocade-vcs/findbugsExcludeFilter.xml
new file mode 100644
index 000..d372850
--- /dev/null
+++ b/plugins/network-elements/brocade-vcs/findbugsExcludeFilter.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/930e4a2a/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml
--
diff --git a/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml 
b/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml
new file mode 100644
index 000..d372850
--- /dev/null
+++ b/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+

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

2014-07-23 Thread sanjeev 
Repository: cloudstack
Updated Branches:
  refs/heads/master 930e4a2a6 -> 9f4f9211d


CLOUDSTACK-5986: Test scipt to verify the fix in isolated network for non-vpc 
networks

Signed-off-by: sanjeev 


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

Branch: refs/heads/master
Commit: 9f4f9211d0aecbfeadfa626b6202109f40200125
Parents: 930e4a2
Author: sanjeev 
Authored: Tue Jul 22 17:15:11 2014 +0530
Committer: sanjeev 
Committed: Wed Jul 23 18:28:08 2014 +0530

--
 .../component/test_escalations_instances.py | 214 ++-
 1 file changed, 213 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f4f9211/test/integration/component/test_escalations_instances.py
--
diff --git a/test/integration/component/test_escalations_instances.py 
b/test/integration/component/test_escalations_instances.py
index 79fd3b1..0cd8b68 100644
--- a/test/integration/component/test_escalations_instances.py
+++ b/test/integration/component/test_escalations_instances.py
@@ -1919,7 +1919,7 @@ class TestInstances(cloudstackTestCase):
 cls.user = cls.account.user[0]
 cls.userapiclient = 
cls.testClient.getUserApiClient(cls.user.username, cls.domain.name)
 # Updating resource Limits
-for i in range(0, 12):
+for i in range(0, 8):
 Resources.updateLimit(
   cls.api_client,
   account=cls.account.name,
@@ -3567,3 +3567,215 @@ class TestInstances(cloudstackTestCase):
 except Exception as e:
 raise Exception("Warning: Exception in expunging vm : %s" % e)
 return
+
+@attr(tags=["advanced", "selfservice"])
+def test_25_ip_reallocation_ES1377(self):
+"""
+@Desc: Test to verify dnsmasq dhcp conflict issue due to /ect/hosts 
not getting udpated
+@Steps:
+Step1: Create a network for the user
+Step2: List the network and check that it is created for the user
+Step3: Deploy vm1 with hostname hostA and ip address IP A in the above 
network
+Step4: List the vm and verify the ip address in the response and 
verify ssh access to vm
+Step5: Deploy vm2 with hostname hostB and ip address IP B in the same 
network
+Step6: Repeat step4
+Step7: Destroy vm1 and vm2
+Step8: Deploy vm3 with hostname hostA and ip address IP B
+Step9: Repeat step4
+Step10: Deploy vm4 with IP A and hostC
+Step11: Repeat step4
+"""
+# Listing Network Offerings
+network_offerings_list = NetworkOffering.list(
+self.apiClient,
+forvpc="false",
+guestiptype="Isolated",
+state="Enabled",
+supportedservices="SourceNat",
+zoneid=self.zone.id
+)
+status = validateList(network_offerings_list)
+self.assertEquals(
+PASS,
+status[0],
+"Isolated Network Offerings with sourceNat enabled are not found"
+)
+"""
+Create Isolated netwrok with ip range
+"""
+self.services["network"]["startip"] = "10.1.1.2"
+self.services["network"]["endip"] = "10.1.1.254"
+self.services["network"]["gateway"] = "10.1.1.1"
+self.services["network"]["netmask"] = "255.255.255.0"
+"""
+Creating isolated/guest network with ip range
+"""
+network = Network.create(
+self.userapiclient,
+self.services["network"],
+accountid=self.account.name,
+domainid=self.domain.id,
+networkofferingid=network_offerings_list[0].id,
+zoneid=self.zone.id
+)
+self.assertIsNotNone(
+network,
+"Network creation failed"
+)
+vm_ip1 = "10.1.1.10"
+name1 = "hostA"
+self.debug("network id:%s" %network.id)
+self.services["virtual_machine"]["name"] = name1
+# Deploying a VM
+vm1 = VirtualMachine.create(
+self.userapiclient,
+self.services["virtual_machine"],
+accountid=self.account.name,
+domainid=self.account.domainid,
+networkids=[network.id],
+ipaddress=vm_ip1,
+serviceofferingid=self.service_offering.id,
+mode="advanced",
+)
+self.assertIsNotNone(
+vm1,
+"VM1 creation failed with ip address %s and host name %s" 
%(vm_ip1,name1)
+)

git commit: updated refs/heads/master to bb1c70b

2014-07-23 Thread santhoshedukulla 
Repository: cloudstack
Updated Branches:
  refs/heads/master 9f4f9211d -> bb1c70b3d


Test if config specifies a zone before using it

Signed-off-by: Santhosh Edukulla 


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

Branch: refs/heads/master
Commit: bb1c70b3d8eedde6dfa2cb992ebd1e9f6ed1cdab
Parents: 9f4f921
Author: miguelaferreira 
Authored: Wed Jul 23 13:50:47 2014 +0200
Committer: Santhosh Edukulla 
Committed: Wed Jul 23 20:30:33 2014 +0530

--
 tools/marvin/marvin/marvinInit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb1c70b3/tools/marvin/marvin/marvinInit.py
--
diff --git a/tools/marvin/marvin/marvinInit.py 
b/tools/marvin/marvin/marvinInit.py
index ce9b43f..56ea509 100644
--- a/tools/marvin/marvin/marvinInit.py
+++ b/tools/marvin/marvin/marvinInit.py
@@ -111,7 +111,7 @@ class MarvinInit:
 if not self.__hypervisorType:
 self.__hypervisorType = XEN_SERVER
 if not self.__zoneForTests:
-if self.__parsedConfig:
+if self.__parsedConfig and self.__parsedConfig.zones is not 
None:
 for zone in self.__parsedConfig.zones:
 self.__zoneForTests = zone.name
 break

svn commit: r5947 - /dev/cloudstack/4.4.0/ /release/cloudstack/releases/4.4.0/

2014-07-23 Thread dahn 
Author: dahn
Date: Wed Jul 23 15:11:01 2014
New Revision: 5947

Log:
Publishing 4.4.0 release

Added:
release/cloudstack/releases/4.4.0/
  - copied from r5946, dev/cloudstack/4.4.0/
Removed:
dev/cloudstack/4.4.0/

git commit: small changes to conf and index

2014-07-23 Thread sebgoa 
Repository: cloudstack-docs-rn
Updated Branches:
  refs/heads/4.3 c483187ee -> 95a8a702e


small changes to conf and index


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/95a8a702
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/95a8a702
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/95a8a702

Branch: refs/heads/4.3
Commit: 95a8a702e78fa5acb0289f078a1d97a1606ad8f3
Parents: c483187
Author: Sebastien Goasguen 
Authored: Wed Jul 23 11:16:41 2014 -0400
Committer: Sebastien Goasguen 
Committed: Wed Jul 23 11:16:41 2014 -0400

--
 source/conf.py   | 2 +-
 source/index.rst | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/95a8a702/source/conf.py
--
diff --git a/source/conf.py b/source/conf.py
index c18daa9..cbbdc27 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -44,7 +44,7 @@ import os
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = []
+extensions = ['javasphinx']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/95a8a702/source/index.rst
--
diff --git a/source/index.rst b/source/index.rst
index 034fc34..a1de4f0 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -56,4 +56,5 @@ Contents:
:maxdepth: 2
 
api-changes
+   packages

git commit: removed 'CloudStack on Windows' from 4.4.0 RN

2014-07-23 Thread sebgoa 
Repository: cloudstack-docs-rn
Updated Branches:
  refs/heads/4.4.0 3056c96f5 -> 64035b630


removed 'CloudStack on Windows' from 4.4.0 RN

Closes #16

Signed-off-by: Sebastien Goasguen 


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/64035b63
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/64035b63
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/64035b63

Branch: refs/heads/4.4.0
Commit: 64035b6302f06c21d64a236009cf82b451a212d2
Parents: 3056c96
Author: Rajani Karuturi 
Authored: Wed Jul 23 10:24:53 2014 +0530
Committer: Sebastien Goasguen 
Committed: Wed Jul 23 11:18:12 2014 -0400

--
 source/about.rst | 13 -
 1 file changed, 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/64035b63/source/about.rst
--
diff --git a/source/about.rst b/source/about.rst
index 1aed8cb..a53dff2 100644
--- a/source/about.rst
+++ b/source/about.rst
@@ -103,19 +103,6 @@ VMWare Support for DRS
== 

 
 
-CloudStack on Windows
--
-
-   Windowsfication of CloudStack Management Server, remove dependency on 
-   cygwin in order to run CloudStack Management Server on Windows based 
-   Operating System.
-   
-   == 

-   Supported hypervisors: N/A
-   Link   `CLOUDSTACK-6105 
`_
-   == 

-
-
 Region wide Guest networks and VPC 
 --

git commit: Mistake: Revert "small changes to conf and index"

2014-07-23 Thread sebgoa 
Repository: cloudstack-docs-rn
Updated Branches:
  refs/heads/4.3 95a8a702e -> 6a8eaa99f


Mistake: Revert "small changes to conf and index"

This reverts commit 95a8a702e78fa5acb0289f078a1d97a1606ad8f3.


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/6a8eaa99
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/6a8eaa99
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/6a8eaa99

Branch: refs/heads/4.3
Commit: 6a8eaa99fb4427ba1e233144bed214c939d5cb6e
Parents: 95a8a70
Author: Sebastien Goasguen 
Authored: Wed Jul 23 12:10:10 2014 -0400
Committer: Sebastien Goasguen 
Committed: Wed Jul 23 12:10:10 2014 -0400

--
 source/conf.py   | 2 +-
 source/index.rst | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/6a8eaa99/source/conf.py
--
diff --git a/source/conf.py b/source/conf.py
index cbbdc27..c18daa9 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -44,7 +44,7 @@ import os
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['javasphinx']
+extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/6a8eaa99/source/index.rst
--
diff --git a/source/index.rst b/source/index.rst
index a1de4f0..034fc34 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -56,5 +56,4 @@ Contents:
:maxdepth: 2
 
api-changes
-   packages

git commit: updated refs/heads/master to c804660

2014-07-23 Thread amoghvk 
Repository: cloudstack
Updated Branches:
  refs/heads/master bb1c70b3d -> c804660c7


CLOUDSTACK-7168: Revert "Fixed Coverity Issues reported" that broke CI

This reverts commit 4523490d44160b054de9e943f72db1d0ce06054a.


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

Branch: refs/heads/master
Commit: c804660c74f08008be4f71607681c83d31f3cc55
Parents: bb1c70b
Author: amoghvk 
Authored: Wed Jul 23 11:37:36 2014 -0700
Committer: amoghvk 
Committed: Wed Jul 23 11:37:36 2014 -0700

--
 .../api/command/user/vm/DeployVMCmd.java|   4 +-
 .../storage/dao/VMTemplatePoolDaoImpl.java  |  67 
 .../com/cloud/upgrade/dao/Upgrade440to450.java  |   5 +-
 .../endpoint/DefaultEndPointSelector.java   |  28 +++--
 .../storage/volume/VolumeServiceImpl.java   |   5 +-
 .../kvm/resource/BridgeVifDriver.java   |  24 ++---
 server/src/com/cloud/api/ApiResponseHelper.java |  76 ++
 .../src/com/cloud/api/doc/ApiXmlDocWriter.java  |  25 ++---
 .../com/cloud/resource/ResourceManagerImpl.java |  21 ++--
 .../cloud/server/ConfigurationServerImpl.java   |   6 +-
 utils/src/com/cloud/utils/nio/NioClient.java| 104 +--
 11 files changed, 193 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c804660c/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
--
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java 
b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 14b703c..1beb595 100755
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -225,8 +225,8 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd 
{
 Iterator iter = parameterCollection.iterator();
 while (iter.hasNext()) {
 HashMap value = (HashMap)iter.next();
-for (Map.Entry entry: value.entrySet()) {
-customparameterMap.put(entry.getKey(),entry.getValue());
+for (String key : value.keySet()) {
+customparameterMap.put(key, value.get(key));
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c804660c/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java 
b/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
index aacd4ff..12a0921 100644
--- a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
@@ -18,6 +18,7 @@ package com.cloud.storage.dao;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -169,25 +170,36 @@ public class VMTemplatePoolDaoImpl extends 
GenericDaoBase listByTemplateStatus(long templateId, 
long datacenterId, long podId, VMTemplateStoragePoolVO.Status downloadState) {
 TransactionLegacy txn = TransactionLegacy.currentTxn();
+PreparedStatement pstmt = null;
 List result = new 
ArrayList();
-String sql = DOWNLOADS_STATE_DC_POD;
-try(PreparedStatement pstmt = txn.prepareStatement(sql);) {
+ResultSet rs = null;
+try {
+String sql = DOWNLOADS_STATE_DC_POD;
+pstmt = txn.prepareStatement(sql);
+
 pstmt.setLong(1, datacenterId);
 pstmt.setLong(2, podId);
 pstmt.setLong(3, templateId);
 pstmt.setString(4, downloadState.toString());
-try(ResultSet rs = pstmt.executeQuery();) {
-while (rs.next()) {
-// result.add(toEntityBean(rs, false)); TODO: this is 
buggy in
-// GenericDaoBase for hand constructed queries
-long id = rs.getLong(1); // ID column
-result.add(findById(id));
-}
-}catch (Exception e) {
-s_logger.warn("Exception: ", e);
+rs = pstmt.executeQuery();
+while (rs.next()) {
+// result.add(toEntityBean(rs, false)); TODO: this is buggy in
+// GenericDaoBase for hand constructed queries
+long id = rs.getLong(1); // ID column
+result.add(findById(id));
 }

git commit: updated refs/heads/master to 44be176

2014-07-23 Thread dahn 
Repository: cloudstack
Updated Branches:
  refs/heads/master c804660c7 -> 44be17648


rename networkMgr to networkMdl to prevent name clashes in mocks of
VirtualRouterElement and VirtualNetworkApplianceManagerImpl

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

Branch: refs/heads/master
Commit: 44be1764863b369c9bcc5c8cc7ddd05405649071
Parents: c804660
Author: Daan Hoogland 
Authored: Wed Jul 23 21:19:31 2014 +0200
Committer: Daan Hoogland 
Committed: Wed Jul 23 21:19:31 2014 +0200

--
 .../network/element/VirtualRouterElement.java | 18 +-
 .../network/element/VpcVirtualRouterElement.java  | 16 
 2 files changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44be1764/server/src/com/cloud/network/element/VirtualRouterElement.java
--
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java 
b/server/src/com/cloud/network/element/VirtualRouterElement.java
index e4660b7..bdebd39 100755
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -121,7 +121,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
 @Inject
 NetworkDao _networksDao;
 @Inject
-NetworkModel _networkMgr;
+NetworkModel _networkMdl;
 @Inject
 LoadBalancingRulesManager _lbMgr;
 @Inject
@@ -155,7 +155,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
 IPAddressDao _ipAddressDao;
 
 protected boolean canHandle(Network network, Service service) {
-Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network);
+Long physicalNetworkId = _networkMdl.getPhysicalNetworkId(network);
 if (physicalNetworkId == null) {
 return false;
 }
@@ -164,17 +164,17 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
 return false;
 }
 
-if (!_networkMgr.isProviderEnabledInPhysicalNetwork(physicalNetworkId, 
Network.Provider.VirtualRouter.getName())) {
+if (!_networkMdl.isProviderEnabledInPhysicalNetwork(physicalNetworkId, 
Network.Provider.VirtualRouter.getName())) {
 return false;
 }
 
 if (service == null) {
-if (!_networkMgr.isProviderForNetwork(getProvider(), 
network.getId())) {
+if (!_networkMdl.isProviderForNetwork(getProvider(), 
network.getId())) {
 s_logger.trace("Element " + getProvider().getName() + " is not 
a provider for the network " + network);
 return false;
 }
 } else {
-if 
(!_networkMgr.isProviderSupportServiceInNetwork(network.getId(), service, 
getProvider())) {
+if 
(!_networkMdl.isProviderSupportServiceInNetwork(network.getId(), service, 
getProvider())) {
 s_logger.trace("Element " + getProvider().getName() + " 
doesn't support service " + service.getName() + " in the network " + network);
 return false;
 }
@@ -224,7 +224,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
 if (offering.isSystemOnly()) {
 return false;
 }
-if 
(!_networkMgr.isProviderEnabledInPhysicalNetwork(_networkMgr.getPhysicalNetworkId(network),
 getProvider().getName())) {
+if 
(!_networkMdl.isProviderEnabledInPhysicalNetwork(_networkMdl.getPhysicalNetworkId(network),
 getProvider().getName())) {
 return false;
 }
 
@@ -252,7 +252,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
 if (rules != null && rules.size() == 1) {
 // for VR no need to add default egress rule to DENY traffic
 if (rules.get(0).getTrafficType() == 
FirewallRule.TrafficType.Egress && rules.get(0).getType() == 
FirewallRule.FirewallRuleType.System &&
-
!_networkMgr.getNetworkEgressDefaultPolicy(config.getId()))
+
!_networkMdl.getNetworkEgressDefaultPolicy(config.getId()))
 return true;
 }
 
@@ -949,11 +949,11 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
 
 protected List getRouters(Network network, 
DeployDestination dest) {
 boolean publicNetwork = false;
-if (_networkMgr.isProviderSupportServiceInNetwork(network.getId(), 
Service.SourceNat, getProvider())) {
+if (_networkMdl.isProviderSupportServiceInNetwork(network.getId(), 
Service.SourceNat, getProvider())) {
 publicNetwork = true;
 }
 boolean isP

git commit: updated refs/heads/master to b8112ac

2014-07-23 Thread dahn 
Repository: cloudstack
Updated Branches:
  refs/heads/master 44be17648 -> b8112ac79


highlevel 'unit'-test for refactoring of (Vpc)VirtualNetworkApplianceManagerImpl


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

Branch: refs/heads/master
Commit: b8112ac79e6205573b15898f83192adf4df74626
Parents: 44be176
Author: Daan Hoogland 
Authored: Wed Jul 23 21:30:21 2014 +0200
Committer: Daan Hoogland 
Committed: Wed Jul 23 21:30:21 2014 +0200

--
 .../element/VirtualRouterElementTest.java   | 278 +++
 1 file changed, 278 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8112ac7/server/test/com/cloud/network/element/VirtualRouterElementTest.java
--
diff --git 
a/server/test/com/cloud/network/element/VirtualRouterElementTest.java 
b/server/test/com/cloud/network/element/VirtualRouterElementTest.java
new file mode 100644
index 000..dcd4691
--- /dev/null
+++ b/server/test/com/cloud/network/element/VirtualRouterElementTest.java
@@ -0,0 +1,278 @@
+package com.cloud.network.element;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import 
org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import com.cloud.cluster.dao.ManagementServerHostDao;
+import com.cloud.configuration.ConfigurationManager;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenter.NetworkType;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.HostPodDao;
+import com.cloud.dc.dao.VlanDao;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.Network;
+import com.cloud.network.Network.Service;
+import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.NetworkModelImpl;
+import com.cloud.network.VirtualRouterProvider.Type;
+import com.cloud.network.dao.FirewallRulesDao;
+import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.LoadBalancerDao;
+import com.cloud.network.dao.LoadBalancerVMMapDao;
+import com.cloud.network.dao.MonitoringServiceDao;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.OpRouterMonitorServiceDao;
+import com.cloud.network.dao.OvsProviderDao;
+import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
+import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
+import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
+import com.cloud.network.dao.Site2SiteVpnConnectionDao;
+import com.cloud.network.dao.Site2SiteVpnGatewayDao;
+import com.cloud.network.dao.UserIpv6AddressDao;
+import com.cloud.network.dao.VirtualRouterProviderDao;
+import com.cloud.network.dao.VpnUserDao;
+import com.cloud.network.router.VirtualRouter.RedundantState;
+import com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl;
+import com.cloud.network.rules.dao.PortForwardingRulesDao;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.offerings.NetworkOfferingVO;
+import com.cloud.offerings.dao.NetworkOfferingDao;
+import com.cloud.resource.ResourceManager;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.Storage.ProvisioningType;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.dao.GuestOSDao;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.AccountVO;
+import com.cloud.user.dao.UserDao;
+import com.cloud.user.dao.UserStatisticsDao;
+import com.cloud.user.dao.UserStatsLogDao;
+import com.cloud.vm.DomainRouterVO;
+impo

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

2014-07-23 Thread dahn 
Repository: cloudstack
Updated Branches:
  refs/heads/master b8112ac79 -> 7f14da640


rats


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

Branch: refs/heads/master
Commit: 7f14da6406679407d6e02e5fb2974da82f6eeaa5
Parents: b8112ac
Author: Daan Hoogland 
Authored: Wed Jul 23 21:31:50 2014 +0200
Committer: Daan Hoogland 
Committed: Wed Jul 23 21:31:50 2014 +0200

--
 .../network/element/VirtualRouterElementTest.java   | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f14da64/server/test/com/cloud/network/element/VirtualRouterElementTest.java
--
diff --git 
a/server/test/com/cloud/network/element/VirtualRouterElementTest.java 
b/server/test/com/cloud/network/element/VirtualRouterElementTest.java
index dcd4691..d6eb24f 100644
--- a/server/test/com/cloud/network/element/VirtualRouterElementTest.java
+++ b/server/test/com/cloud/network/element/VirtualRouterElementTest.java
@@ -1,3 +1,19 @@
+// 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.
 package com.cloud.network.element;
 
 import static org.junit.Assert.assertTrue;

[2/2] git commit: removed 'CloudStack on Windows' from 4.4.0 RN

2014-07-23 Thread pdion891 
removed 'CloudStack on Windows' from 4.4.0 RN

Signed-off-by: pdion891 


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/8823c957
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/8823c957
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/8823c957

Branch: refs/heads/master
Commit: 8823c957682aa1cc00d73077e244ce3acd28b4a2
Parents: a5e2ccb
Author: Rajani Karuturi 
Authored: Wed Jul 23 10:24:53 2014 +0530
Committer: pdion891 
Committed: Wed Jul 23 18:00:02 2014 -0400

--
 source/about.rst | 13 -
 1 file changed, 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/8823c957/source/about.rst
--
diff --git a/source/about.rst b/source/about.rst
index 1aed8cb..a53dff2 100644
--- a/source/about.rst
+++ b/source/about.rst
@@ -103,19 +103,6 @@ VMWare Support for DRS
== 

 
 
-CloudStack on Windows
--
-
-   Windowsfication of CloudStack Management Server, remove dependency on 
-   cygwin in order to run CloudStack Management Server on Windows based 
-   Operating System.
-   
-   == 

-   Supported hypervisors: N/A
-   Link   `CLOUDSTACK-6105 
`_
-   == 

-
-
 Region wide Guest networks and VPC 
 --

[1/2] git commit: rephrase _no-sysvm-templates.rst

2014-07-23 Thread pdion891 
Repository: cloudstack-docs-rn
Updated Branches:
  refs/heads/master 3056c96f5 -> 8823c9576


rephrase _no-sysvm-templates.rst


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/a5e2ccb5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/tree/a5e2ccb5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/diff/a5e2ccb5

Branch: refs/heads/master
Commit: a5e2ccb557f3ab46e14420a0a067a14d06d3749a
Parents: 3056c96
Author: pdion891 
Authored: Wed Jul 23 17:39:52 2014 -0400
Committer: pdion891 
Committed: Wed Jul 23 17:39:52 2014 -0400

--
 source/upgrade/_no-sysvm_templates.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/a5e2ccb5/source/upgrade/_no-sysvm_templates.rst
--
diff --git a/source/upgrade/_no-sysvm_templates.rst 
b/source/upgrade/_no-sysvm_templates.rst
index 6c795ee..678e156 100644
--- a/source/upgrade/_no-sysvm_templates.rst
+++ b/source/upgrade/_no-sysvm_templates.rst
@@ -18,4 +18,4 @@
 Update System-VM templates
 --
 
-This Upgrade path from version |version_to_upgrade| to |release| does not 
require systemvm-templates upgrade.
\ No newline at end of file
+Upgrade from |version_to_upgrade| to |release| does not require new 
systemvm-templates.
\ No newline at end of file

git commit: updated refs/heads/master to 351cc82

2014-07-23 Thread alena1108 
Repository: cloudstack
Updated Branches:
  refs/heads/master 7f14da640 -> 351cc829e


CLOUDSTACK-969: Zone response - removed vlan from the zoneResponse as this 
field was moved to PhysicalNetworkResponse around 3 releases ago


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

Branch: refs/heads/master
Commit: 351cc829e3dbdd27c740b8e4a0e8c3afa6252ff1
Parents: 7f14da6
Author: Alena Prokharchyk 
Authored: Wed Jul 23 16:10:12 2014 -0700
Committer: Alena Prokharchyk 
Committed: Wed Jul 23 16:10:12 2014 -0700

--
 .../org/apache/cloudstack/api/response/ZoneResponse.java | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/351cc829/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java 
b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
index bbb9a7b..7aee448 100644
--- a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
@@ -21,14 +21,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.google.gson.annotations.SerializedName;
-
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
 import com.cloud.dc.DataCenter;
 import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
 @EntityReference(value = DataCenter.class)
@@ -69,10 +68,6 @@ public class ZoneResponse extends BaseResponse {
 @Param(description = "the second internal DNS for the Zone")
 private String internalDns2;
 
-@SerializedName(ApiConstants.VLAN)
-@Param(description = "the vlan range of the zone")
-private String vlan;
-
 @SerializedName(ApiConstants.GUEST_CIDR_ADDRESS)
 @Param(description = "the guest CIDR address for the Zone")
 private String guestCidrAddress;
@@ -165,10 +160,6 @@ public class ZoneResponse extends BaseResponse {
 this.internalDns2 = internalDns2;
 }
 
-public void setVlan(String vlan) {
-this.vlan = vlan;
-}
-
 public void setGuestCidrAddress(String guestCidrAddress) {
 this.guestCidrAddress = guestCidrAddress;
 }

git commit: updated refs/heads/master to e6ead31

2014-07-23 Thread mchen 
Repository: cloudstack
Updated Branches:
  refs/heads/master 351cc829e -> e6ead3176


CLOUDSTACK-7175:Domain Id is exposed in error message when cross domain
access is attempted when listing Vms.

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

Branch: refs/heads/master
Commit: e6ead3176c2132d38283dc404ae601506e278a34
Parents: 351cc82
Author: Min Chen 
Authored: Wed Jul 23 17:36:15 2014 -0700
Committer: Min Chen 
Committed: Wed Jul 23 17:36:15 2014 -0700

--
 server/src/com/cloud/acl/DomainChecker.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6ead317/server/src/com/cloud/acl/DomainChecker.java
--
diff --git a/server/src/com/cloud/acl/DomainChecker.java 
b/server/src/com/cloud/acl/DomainChecker.java
index 729a0d1..a6bdce4 100755
--- a/server/src/com/cloud/acl/DomainChecker.java
+++ b/server/src/com/cloud/acl/DomainChecker.java
@@ -80,10 +80,10 @@ public class DomainChecker extends AdapterBase implements 
SecurityChecker {
 
 if (_accountService.isNormalUser(caller.getId())) {
 if (caller.getDomainId() != domainId) {
-throw new PermissionDeniedException(caller + " does not have 
permission to operate within domain id=" + domain.getId());
+throw new PermissionDeniedException(caller + " does not have 
permission to operate within domain id=" + domain.getUuid());
 }
 } else if (!_domainDao.isChildDomain(caller.getDomainId(), domainId)) {
-throw new PermissionDeniedException(caller + " does not have 
permission to operate within domain id=" + domain.getId());
+throw new PermissionDeniedException(caller + " does not have 
permission to operate within domain id=" + domain.getUuid());
 }
 
 return true;

git commit: updated refs/heads/master to 0f85e64

2014-07-23 Thread saksham 
Repository: cloudstack
Updated Branches:
  refs/heads/master e6ead3176 -> 0f85e649b


CLOUDSTACK-5999: Virtual Router does not start if Guest VM is rebooted from 
CloudStack


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

Branch: refs/heads/master
Commit: 0f85e649b64b38cf80bc1e86ac15b206bef65117
Parents: e6ead31
Author: Saksham Srivastava 
Authored: Thu Jul 24 10:07:59 2014 +0530
Committer: Saksham Srivastava 
Committed: Thu Jul 24 10:45:51 2014 +0530

--
 .../src/com/cloud/vm/dao/DomainRouterDao.java   |  2 +
 .../com/cloud/vm/dao/DomainRouterDaoImpl.java   |  8 
 server/src/com/cloud/vm/UserVmManagerImpl.java  | 46 +---
 3 files changed, 50 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f85e649/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
--
diff --git a/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java 
b/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
index 72ff8a9..d555e79 100755
--- a/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
+++ b/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
@@ -154,4 +154,6 @@ public interface DomainRouterDao extends 
GenericDao {
 List listRunningByAccountId(long accountId);
 
 List listRunningByDataCenter(long dcId);
+
+List listStopped(long networkId);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f85e649/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java 
b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
index ea919ac..fca1ff8 100755
--- a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
@@ -425,4 +425,12 @@ public class DomainRouterDaoImpl extends 
GenericDaoBase im
 sc.setParameters("dc", dcId);
 return listBy(sc);
 }
+
+@Override
+public List listStopped(long networkId) {
+SearchCriteria sc = IdNetworkIdStatesSearch.create();
+sc.setJoinParameters("networkRouter", "networkId", networkId);
+sc.setParameters("states", State.Stopped);
+return listBy(sc);
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f85e649/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 ab9ebe0..dd3083b 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -35,10 +35,6 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.server.ManagementService;
-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;
@@ -66,6 +62,7 @@ import 
org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
 import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
+import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMNetworkMapDao;
 import 
org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import 
org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
 import org.apache.cloudstack.engine.service.api.OrchestrationService;
@@ -87,6 +84,8 @@ import org.apache.cloudstack.storage.command.DeleteCommand;
 import org.apache.cloudstack.storage.command.DettachCommand;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
@@ -173,6 +172,7 @@ import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.element.UserDataServiceProvider;
 import com.cloud.network.guru.NetworkGuru;
 import com.cloud.network.lb.LoadBalancingRulesManager;
+import com.cloud.network.router.VpcVirtualNetworkApplianceManager;
 import com.cloud.network.rules.FirewallManager;
 import com.cloud.network.rules.FirewallR