incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [8/50] [abbrv] git commit: refs/heads/storage_refactor - CLOUDSTACK-1237: Fix an overriding method that would help find template adapter
Date Thu, 14 Feb 2013 01:11:27 GMT
CLOUDSTACK-1237: Fix an overriding method that would help find template adapter

Signed-off-by: Rohit Yadav <bhaisaab@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/fcb4b7a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fcb4b7a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fcb4b7a6

Branch: refs/heads/storage_refactor
Commit: fcb4b7a6a7e646c5e3cd7961336258a3d30d6abc
Parents: f23ec61
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Wed Feb 13 15:17:49 2013 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Wed Feb 13 15:19:30 2013 +0530

----------------------------------------------------------------------
 .../manager/BareMetalTemplateAdapter.java          |    5 +++++
 .../cloud/baremetal/BareMetalTemplateAdapter.java  |    7 ++++++-
 .../cloud/template/HyervisorTemplateAdapter.java   |    5 +++++
 3 files changed, 16 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fcb4b7a6/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
index ba5e811..33725f6 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
@@ -58,6 +58,11 @@ public class BareMetalTemplateAdapter extends TemplateAdapterBase implements
Tem
 	private final static Logger s_logger = Logger.getLogger(BareMetalTemplateAdapter.class);
 	@Inject HostDao _hostDao;
 	@Inject ResourceManager _resourceMgr;
+
+    @Override
+    public String getName() {
+        return TemplateAdapterType.BareMetal.getName();
+    }
 	
 	@Override
 	public TemplateProfile prepare(RegisterTemplateCmd cmd) throws ResourceAllocationException
{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fcb4b7a6/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java b/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
index 965c912..4440b7a 100755
--- a/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
+++ b/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
@@ -54,7 +54,12 @@ public class BareMetalTemplateAdapter extends TemplateAdapterBase implements
Tem
 	private final static Logger s_logger = Logger.getLogger(BareMetalTemplateAdapter.class);
 	@Inject HostDao _hostDao;
 	@Inject ResourceManager _resourceMgr;
-	
+
+    @Override
+    public String getName() {
+        return TemplateAdapterType.BareMetal.getName();
+    }
+
 	@Override
 	public TemplateProfile prepare(RegisterTemplateCmd cmd) throws ResourceAllocationException
{
 		TemplateProfile profile = super.prepare(cmd);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fcb4b7a6/server/src/com/cloud/template/HyervisorTemplateAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/HyervisorTemplateAdapter.java b/server/src/com/cloud/template/HyervisorTemplateAdapter.java
index 089f650..fe6bc2a 100755
--- a/server/src/com/cloud/template/HyervisorTemplateAdapter.java
+++ b/server/src/com/cloud/template/HyervisorTemplateAdapter.java
@@ -70,6 +70,11 @@ public class HyervisorTemplateAdapter extends TemplateAdapterBase implements
Tem
 	@Inject DownloadMonitor _downloadMonitor;
 	@Inject SecondaryStorageVmManager _ssvmMgr;
 	@Inject AgentManager _agentMgr;
+
+    @Override
+    public String getName() {
+        return TemplateAdapterType.Hypervisor.getName();
+    }
 	
 	private String validateUrl(String url) {
 		try {


Mime
View raw message