You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/01/14 17:15:58 UTC
[34/50] git commit: DomainService: Fix getDomain by uuid string
DomainService: Fix getDomain by uuid string
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/31dd4126
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/31dd4126
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/31dd4126
Branch: refs/heads/cloud-agent-with-openvswitch
Commit: 31dd412626ee3ab0bbdf99d8417d806b6a156582
Parents: 7960dd4
Author: Rohit Yadav <bh...@apache.org>
Authored: Fri Jan 11 14:05:41 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Fri Jan 11 18:44:19 2013 -0800
----------------------------------------------------------------------
api/src/com/cloud/user/DomainService.java | 2 ++
server/src/com/cloud/user/DomainManagerImpl.java | 5 +++++
.../test/com/cloud/user/MockDomainManagerImpl.java | 6 ++++++
3 files changed, 13 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/31dd4126/api/src/com/cloud/user/DomainService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/DomainService.java b/api/src/com/cloud/user/DomainService.java
index 6fbe1b9..cd20060 100644
--- a/api/src/com/cloud/user/DomainService.java
+++ b/api/src/com/cloud/user/DomainService.java
@@ -30,6 +30,8 @@ public interface DomainService {
Domain getDomain(long id);
+ Domain getDomain(String uuid);
+
/**
* Return whether a domain is a child domain of a given domain.
*
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/31dd4126/server/src/com/cloud/user/DomainManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java
index 123b895..54ca2ac 100644
--- a/server/src/com/cloud/user/DomainManagerImpl.java
+++ b/server/src/com/cloud/user/DomainManagerImpl.java
@@ -86,6 +86,11 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager
}
@Override
+ public Domain getDomain(String domainUuid) {
+ return _domainDao.findByUuid(domainUuid);
+ }
+
+ @Override
public String getName() {
return _name;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/31dd4126/server/test/com/cloud/user/MockDomainManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/user/MockDomainManagerImpl.java b/server/test/com/cloud/user/MockDomainManagerImpl.java
index 6dc4d07..9f49535 100644
--- a/server/test/com/cloud/user/MockDomainManagerImpl.java
+++ b/server/test/com/cloud/user/MockDomainManagerImpl.java
@@ -47,6 +47,12 @@ public class MockDomainManagerImpl implements Manager, DomainManager {
}
@Override
+ public Domain getDomain(String uuid) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
public boolean isChildDomain(Long parentId, Long childId) {
// TODO Auto-generated method stub
return false;