Skip to content

Commit 518ed53

Browse files
yadvryadvr
committed
Merge remote-tracking branch 'origin/4.13'
2 parents 920531f + 7a25e40 commit 518ed53

11 files changed

Lines changed: 89 additions & 59 deletions

File tree

‎api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.apache.cloudstack.api.BaseCmd;
2323
import org.apache.cloudstack.api.BaseListCmd;
2424
import org.apache.cloudstack.api.Parameter;
25-
import org.apache.cloudstack.api.response.HostResponse;
2625
import org.apache.cloudstack.api.response.ListResponse;
2726
import org.apache.cloudstack.api.response.ManagementServerResponse;
2827
import org.apache.log4j.Logger;
@@ -38,7 +37,7 @@ public class ListMgmtsCmd extends BaseListCmd {
3837
//////////////// API parameters /////////////////////
3938
/////////////////////////////////////////////////////
4039

41-
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = HostResponse.class, description = "the id of the management server")
40+
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ManagementServerResponse.class, description = "the id of the management server")
4241
private Long id;
4342

4443
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name of the management server")

‎api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@
2121
import java.util.List;
2222
import java.util.Map;
2323

24-
import com.google.gson.annotations.SerializedName;
25-
2624
import org.apache.cloudstack.api.ApiConstants;
2725
import org.apache.cloudstack.api.BaseResponse;
2826
import org.apache.cloudstack.api.EntityReference;
2927

3028
import com.cloud.org.Cluster;
3129
import com.cloud.serializer.Param;
30+
import com.google.gson.annotations.SerializedName;
3231

3332
@EntityReference(value = Cluster.class)
3433
public class ClusterResponse extends BaseResponse {
@@ -216,4 +215,8 @@ public void setResourceDetails(Map<String, String> details) {
216215
resourceDetails.remove("password");
217216
}
218217
}
218+
219+
public Map<String, String> getResourceDetails() {
220+
return resourceDetails;
221+
}
219222
}

‎api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@
1616
// under the License.
1717
package org.apache.cloudstack.api.response;
1818

19-
import com.cloud.host.Host;
20-
import com.cloud.host.Status;
21-
import com.cloud.hypervisor.Hypervisor.HypervisorType;
22-
import com.cloud.serializer.Param;
23-
import com.google.gson.annotations.SerializedName;
19+
import java.util.Date;
20+
import java.util.HashMap;
21+
import java.util.List;
22+
import java.util.Map;
23+
2424
import org.apache.cloudstack.api.ApiConstants;
2525
import org.apache.cloudstack.api.BaseResponse;
2626
import org.apache.cloudstack.api.EntityReference;
2727
import org.apache.cloudstack.ha.HAConfig;
2828
import org.apache.cloudstack.outofbandmanagement.OutOfBandManagement;
2929

30-
import java.util.Date;
31-
import java.util.HashMap;
32-
import java.util.List;
33-
import java.util.Map;
30+
import com.cloud.host.Host;
31+
import com.cloud.host.Status;
32+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
33+
import com.cloud.serializer.Param;
34+
import com.google.gson.annotations.SerializedName;
3435

3536
@EntityReference(value = Host.class)
3637
public class HostResponse extends BaseResponse {
@@ -243,11 +244,6 @@ public class HostResponse extends BaseResponse {
243244
@Param(description = "the admin that annotated this host", since = "4.11")
244245
private String username;
245246

246-
// Default visibility to support accessing the details from unit tests
247-
Map getDetails() {
248-
return details;
249-
}
250-
251247
@Override
252248
public String getObjectId() {
253249
return this.getId();
@@ -361,7 +357,7 @@ public void setMemoryUsed(Long memoryUsed) {
361357
this.memoryUsed = memoryUsed;
362358
}
363359

364-
public void setGpuGroups(List<GpuResponse> gpuGroup) {
360+
public void setGpuGroup(List<GpuResponse> gpuGroup) {
365361
this.gpuGroup = gpuGroup;
366362
}
367363

@@ -437,6 +433,10 @@ public void setHostHAResponse(final HAConfig config) {
437433
this.hostHAResponse = new HostHAResponse(config);
438434
}
439435

436+
public void setHostHAResponse(HostHAResponse hostHAResponse) {
437+
this.hostHAResponse = hostHAResponse;
438+
}
439+
440440
public OutOfBandManagementResponse getOutOfBandManagementResponse() {
441441
return outOfBandManagementResponse;
442442
}
@@ -445,6 +445,10 @@ public void setOutOfBandManagementResponse(final OutOfBandManagement outOfBandMa
445445
this.outOfBandManagementResponse = new OutOfBandManagementResponse(outOfBandManagementConfig);
446446
}
447447

448+
public void setOutOfBandManagementResponse(OutOfBandManagementResponse outOfBandManagementResponse) {
449+
this.outOfBandManagementResponse = outOfBandManagementResponse;
450+
}
451+
448452
public String getResourceState() {
449453
return resourceState;
450454
}
@@ -496,7 +500,10 @@ public void setDetails(Map details) {
496500
detailsCopy.remove("password");
497501

498502
this.details = detailsCopy;
503+
}
499504

505+
public Map getDetails() {
506+
return details;
500507
}
501508

502509
public void setMemoryTotal(Long memoryTotal) {

‎api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -262,19 +262,19 @@ public class VolumeResponse extends BaseResponseWithTagInformation implements Co
262262

263263
@SerializedName(ApiConstants.CLUSTER_ID)
264264
@Param(description = "cluster id of the volume")
265-
private String clusterid;
265+
private String clusterId;
266266

267267
@SerializedName(ApiConstants.CLUSTER_NAME)
268268
@Param(description = "cluster name where the volume is allocated")
269-
private String clustername;
269+
private String clusterName;
270270

271271
@SerializedName(ApiConstants.POD_ID)
272272
@Param(description = "pod id of the volume")
273-
private String podid;
273+
private String podId;
274274

275275
@SerializedName(ApiConstants.POD_NAME)
276276
@Param(description = "pod name of the volume")
277-
private String podname;
277+
private String podName;
278278

279279
public String getPath() {
280280
return path;
@@ -751,35 +751,34 @@ public void setUtilization(String utilization) {
751751
}
752752

753753
public String getClusterId() {
754-
return clusterid;
754+
return clusterId;
755755
}
756756

757-
public void setClusterId(String clusterid) {
758-
this.clusterid = clusterid;
757+
public void setClusterId(String clusterId) {
758+
this.clusterId = clusterId;
759759
}
760760

761761
public String getClusterName() {
762-
return clustername;
762+
return clusterName;
763763
}
764764

765-
public void setClusterName(String clustername) {
766-
this.clustername = clustername;
765+
public void setClusterName(String clusterName) {
766+
this.clusterName = clusterName;
767767
}
768768

769769
public String getPodId() {
770-
return podid;
770+
return podId;
771771
}
772772

773-
public void setPodId(String podid) {
774-
this.podid = podid;
773+
public void setPodId(String podId) {
774+
this.podId = podId;
775775
}
776776

777777
public String getPodName() {
778-
return podname;
778+
return podName;
779779
}
780780

781-
public void setPodName(String podname) {
782-
this.podname = podname;
781+
public void setPodName(String podName) {
782+
this.podName = podName;
783783
}
784-
785784
}

‎api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public void setDomainId(String domainId) {
173173
this.domainId = domainId;
174174
}
175175

176-
public void setType(String networkType) {
176+
public void setNetworkType(String networkType) {
177177
this.networkType = networkType;
178178
}
179179

‎api/src/main/java/org/apache/cloudstack/management/ManagementServerHost.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
// under the License.
1717
package org.apache.cloudstack.management;
1818

19-
public interface ManagementServerHost {
19+
import org.apache.cloudstack.api.Identity;
20+
import org.apache.cloudstack.api.InternalIdentity;
21+
22+
public interface ManagementServerHost extends InternalIdentity, Identity {
2023
enum State {
2124
Up, Down
2225
}
2326

24-
long getId();
25-
26-
String getUuid();
27-
2827
long getMsid();
2928

3029
State getState();

‎server/src/main/java/com/cloud/api/query/QueryManagerImpl.java‎

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3868,20 +3868,43 @@ protected ResourceDetailResponse createResourceDetailsResponse(ResourceDetail re
38683868
@Override
38693869
public ListResponse<ManagementServerResponse> listManagementServers(ListMgmtsCmd cmd) {
38703870
ListResponse<ManagementServerResponse> response = new ListResponse<>();
3871-
List<ManagementServerResponse> result = new ArrayList<>();
3872-
for (ManagementServerHostVO mgmt : managementServerHostDao.listAll()) {
3873-
ManagementServerResponse mgmtResponse = new ManagementServerResponse();
3874-
mgmtResponse.setId(mgmt.getUuid());
3875-
mgmtResponse.setName(mgmt.getName());
3876-
mgmtResponse.setState(mgmt.getState());
3877-
mgmtResponse.setVersion(mgmt.getVersion());
3878-
mgmtResponse.setObjectName("managementserver");
3879-
result.add(mgmtResponse);
3871+
Pair<List<ManagementServerHostVO>, Integer> result = listManagementServersInternal(cmd);
3872+
List<ManagementServerResponse> hostResponses = new ArrayList<>();
3873+
3874+
for (ManagementServerHostVO host : result.first()) {
3875+
ManagementServerResponse hostResponse = createManagementServerResponse(host);
3876+
hostResponses.add(hostResponse);
38803877
}
3881-
response.setResponses(result);
3878+
3879+
response.setResponses(hostResponses);
38823880
return response;
38833881
}
38843882

3883+
protected Pair<List<ManagementServerHostVO>, Integer> listManagementServersInternal(ListMgmtsCmd cmd) {
3884+
Long id = cmd.getId();
3885+
String name = cmd.getHostName();
3886+
3887+
SearchBuilder<ManagementServerHostVO> sb = managementServerHostDao.createSearchBuilder();
3888+
SearchCriteria<ManagementServerHostVO> sc = sb.create();
3889+
if (id != null) {
3890+
sc.addAnd("id", SearchCriteria.Op.EQ, id);
3891+
}
3892+
if (name != null) {
3893+
sc.addAnd("name", SearchCriteria.Op.EQ, name);
3894+
}
3895+
return managementServerHostDao.searchAndCount(sc, null);
3896+
}
3897+
3898+
protected ManagementServerResponse createManagementServerResponse(ManagementServerHostVO mgmt) {
3899+
ManagementServerResponse mgmtResponse = new ManagementServerResponse();
3900+
mgmtResponse.setId(mgmt.getUuid());
3901+
mgmtResponse.setName(mgmt.getName());
3902+
mgmtResponse.setState(mgmt.getState());
3903+
mgmtResponse.setVersion(mgmt.getVersion());
3904+
mgmtResponse.setObjectName("managementserver");
3905+
return mgmtResponse;
3906+
}
3907+
38853908
@Override
38863909
public ListResponse<TemplateOVFPropertyResponse> listTemplateOVFProperties(ListTemplateOVFProperties cmd) {
38873910
ListResponse<TemplateOVFPropertyResponse> response = new ListResponse<>();

‎server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public ZoneResponse newDataCenterResponse(ResponseView view, DataCenterJoinVO da
9090
zoneResponse.setDomainId(dataCenter.getDomainUuid());
9191
zoneResponse.setDomainName(dataCenter.getDomainName());
9292

93-
zoneResponse.setType(dataCenter.getNetworkType().toString());
93+
zoneResponse.setNetworkType(dataCenter.getNetworkType().toString());
9494
zoneResponse.setAllocationState(dataCenter.getAllocationState().toString());
9595
zoneResponse.setZoneToken(dataCenter.getZoneToken());
9696
zoneResponse.setDhcpProvider(dataCenter.getDhcpProvider());

‎server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail
138138
}
139139
gpus.add(gpuResponse);
140140
}
141-
hostResponse.setGpuGroups(gpus);
141+
hostResponse.setGpuGroup(gpus);
142142
}
143143
if (details.contains(HostDetails.all) || details.contains(HostDetails.capacity) || details.contains(HostDetails.stats) || details.contains(HostDetails.events)) {
144144

‎systemvm/debian/opt/cloud/bin/cs/CsHelper.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
PUBLIC_INTERFACES = {"router": "eth2", "vpcrouter": "eth1"}
3131

32-
STATE_COMMANDS = {"router": "ip addr | grep eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo \"MASTER\"; else echo \"BACKUP\"; fi'",
33-
"vpcrouter": "ip addr | grep eth1 | grep state | awk '{print $9;}' | xargs bash -c 'if [ $0 == \"UP\" ]; then echo \"MASTER\"; else echo \"BACKUP\"; fi'"}
32+
STATE_COMMANDS = {"router": "ip addr show dev eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo \"MASTER\"; else echo \"BACKUP\"; fi'",
33+
"vpcrouter": "ip addr show dev eth1 | grep state | awk '{print $9;}' | xargs bash -c 'if [ $0 == \"UP\" ]; then echo \"MASTER\"; else echo \"BACKUP\"; fi'"}
3434

3535

3636
def reconfigure_interfaces(router_config, interfaces):
@@ -215,7 +215,7 @@ def save_iptables(command, iptables_file):
215215

216216
def execute2(command, wait=True):
217217
""" Execute command """
218-
logging.debug("Executing: %s" % command)
218+
logging.info("Executing: %s" % command)
219219
p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
220220
if wait:
221221
p.wait()

0 commit comments

Comments
 (0)