Skip to content

mgmt: add back serviceip in ManagementServerResponse #10891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 21, 2025
Merged

mgmt: add back serviceip in ManagementServerResponse #10891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0502826
mgmt: add back serviceip in ManagementServerResponse
weizhouapache May 19, 2025
9244d93
Merge branch '4.20' into 4.20-add-back-serviceip
weizhouapache May 19, 2025
dfd1c46
api: add Deprecated annotation to serviceip
weizhouapache May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ public class ApiConstants {
public static final String SENT = "sent";
public static final String SENT_BYTES = "sentbytes";
public static final String SERIAL = "serial";
public static final String SERVICE_IP = "serviceip";
public static final String SERVICE_OFFERING_ID = "serviceofferingid";
public static final String SESSIONKEY = "sessionkey";
public static final String SHOW_CAPACITIES = "showcapacities";
Expand Down
13 changes: 13 additions & 0 deletions api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@
@Param(description = "the running OS kernel version for this Management Server")
private String kernelVersion;

@Deprecated
@SerializedName(ApiConstants.SERVICE_IP)
@Param(description = "the IP Address for this Management Server. This is deprecated, please use 'ipaddress' instead.")
private String serviceIp;

@SerializedName(ApiConstants.IP_ADDRESS)
@Param(description = "the IP Address for this Management Server")
private String ipAddress;
Expand Down Expand Up @@ -122,6 +127,10 @@
return lastBoot;
}

public String getServiceIp() {
return serviceIp;
}

Check warning on line 132 in api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java#L130-L132 

Added lines #L130 - L132 were not covered by tests

public String getIpAddress() {
return ipAddress;
}
Expand Down Expand Up @@ -170,6 +179,10 @@
this.kernelVersion = kernelVersion;
}

public void setServiceIp(String serviceIp) {
this.serviceIp = serviceIp;
}

Check warning on line 184 in api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java#L182-L184 

Added lines #L182 - L184 were not covered by tests

public void setIpAddress(String ipAddress) {
this.ipAddress = ipAddress;
}
Expand Down
1 change: 1 addition & 0 deletions server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5445,6 +5445,7 @@
mgmtResponse.addPeer(createPeerManagementServerNodeResponse(peer));
}
}
mgmtResponse.setServiceIp(mgmt.getServiceIP());

Check warning on line 5448 in server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java#L5448 

Added line #L5448 was not covered by tests
mgmtResponse.setIpAddress(mgmt.getServiceIP());
mgmtResponse.setObjectName("managementserver");
return mgmtResponse;
Expand Down
Loading