Merge pull request #874 from harikrishna-patnala/CLOUDSTACK-8897

karuturi · web-flow · commit 8e087ca3ef3d · 2017-05-18T15:15:46.000+05:30
CLOUDSTACK-8897: baremetal:addHost:make host tag info mandtory in bar…
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -679,6 +679,12 @@ private List<HostVO> discoverHostsFull(final Long dcId, final Long podId, Long c
             }
         }
 
+        if ((hypervisorType.equalsIgnoreCase(HypervisorType.BareMetal.toString()))) {
+            if (hostTags.isEmpty()) {
+                throw new InvalidParameterValueException("hosttag is mandatory while adding host of type Baremetal");
+            }
+        }
+
         if (clusterName != null) {
             final HostPodVO pod = _podDao.findById(podId);
             if (pod == null) {

Original file line number	Diff line number	Diff line change
`@@ -679,6 +679,12 @@ private List<HostVO> discoverHostsFull(final Long dcId, final Long podId, Long c`
`679`	`679`	`}`
`680`	`680`	`}`
`681`	`681`
	`682`	`+ if ((hypervisorType.equalsIgnoreCase(HypervisorType.BareMetal.toString()))) {`
	`683`	`+ if (hostTags.isEmpty()) {`
	`684`	`+ throw new InvalidParameterValueException("hosttag is mandatory while adding host of type Baremetal");`
	`685`	`+ }`
	`686`	`+ }`
	`687`	`+`
`682`	`688`	`if (clusterName != null) {`
`683`	`689`	`final HostPodVO pod = _podDao.findById(podId);`
`684`	`690`	`if (pod == null) {`