Yaniv Bronhaim has uploaded a new change for review.
Change subject: core: fixing format for external provider objects
......................................................................
core: fixing format for external provider objects
Change-Id: I6b1cc0c30b366e11bb7847a41c6234829a83e0bf
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResource.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResourceWrapper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHost.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHostWrapper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHost.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroup.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroupWrapper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostWrapper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystem.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystemWrapper.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalEntityBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHost.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
17 files changed, 271 insertions(+), 71 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/29548/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResource.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResource.java
index 78afe36..4f1ff29 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResource.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResource.java
@@ -10,25 +10,42 @@
private String provider;
private String user;
- public String getProvider() { return provider; }
- public void setProvider(String provider) { this.provider = provider; }
- public String getUser() { return user; }
- public void setUser(String user) { this.user = user; }
+ public String getProvider() {
+ return provider;
+ }
+
+ public void setProvider(String provider) {
+ this.provider = provider;
+ }
+
+ public String getUser() {
+ return user;
+ }
+
+ public void setUser(String user) {
+ this.user = user;
+ }
+
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
+
public String getUrl() {
return url;
}
+
public void setUrl(String url) {
this.url = url;
}
+
public int getId() {
return id;
}
+
public void setId(int id) {
this.id = id;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResourceWrapper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResourceWrapper.java
index dbf8537..067e8f9 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResourceWrapper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanComputerResourceWrapper.java
@@ -3,7 +3,14 @@
import org.codehaus.jackson.annotate.JsonProperty;
public class ForemanComputerResourceWrapper {
- @JsonProperty("results") private ForemanComputerResource[] results;
- public ForemanComputerResource[] getResults() { return results; }
- public void setResults(ForemanComputerResource[] host) { this.results =
host; }
+ @JsonProperty("results")
+ private ForemanComputerResource[] results;
+
+ public ForemanComputerResource[] getResults() {
+ return results;
+ }
+
+ public void setResults(ForemanComputerResource[] host) {
+ this.results = host;
+ }
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHost.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHost.java
index c3feb38..f8b55c2 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHost.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHost.java
@@ -10,25 +10,42 @@
private String last_report;
private String subnet_name;
- public String getSubnet_name() { return subnet_name; }
- public void setSubnet_name(String subnet_name) { this.subnet_name =
subnet_name; }
- public String getLast_report() { return last_report; }
- public void setLast_report(String last_report) { this.last_report =
last_report; }
+ public String getSubnet_name() {
+ return subnet_name;
+ }
+
+ public void setSubnet_name(String subnet_name) {
+ this.subnet_name = subnet_name;
+ }
+
+ public String getLast_report() {
+ return last_report;
+ }
+
+ public void setLast_report(String last_report) {
+ this.last_report = last_report;
+ }
+
public String getMac() {
return mac;
}
+
public void setMac(String mac) {
this.mac = mac;
}
+
public String getIp() {
return ip;
}
+
public void setIp(String ip) {
this.ip = ip;
}
+
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHostWrapper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHostWrapper.java
index ea22998..7137797 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHostWrapper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanDiscoveredHostWrapper.java
@@ -3,7 +3,14 @@
import org.codehaus.jackson.annotate.JsonProperty;
public class ForemanDiscoveredHostWrapper {
- @JsonProperty("results") private ForemanDiscoveredHost[] results;
- public ForemanDiscoveredHost[] getResults() { return results; }
- public void setResults(ForemanDiscoveredHost[] host) { this.results =
host; }
+ @JsonProperty("results")
+ private ForemanDiscoveredHost[] results;
+
+ public ForemanDiscoveredHost[] getResults() {
+ return results;
+ }
+
+ public void setResults(ForemanDiscoveredHost[] host) {
+ this.results = host;
+ }
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHost.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHost.java
index 7283d7f..ef68e1c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHost.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHost.java
@@ -10,12 +10,15 @@
public String getIp() {
return ip;
}
+
public void setIp(String ip) {
this.ip = ip;
}
+
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroup.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroup.java
index 5b12ddd..7f9c53b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroup.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroup.java
@@ -22,75 +22,122 @@
private String domain_name;
private String architecture_name;
- public String getSubnet_name() { return subnet_name; }
- public void setSubnet_name(String subnet_name) { this.subnet_name =
subnet_name; }
- public String getOperatingsystem_name() { return operatingsystem_name; }
- public void setOperatingsystem_name(String operatingsystem_name) {
this.operatingsystem_name = operatingsystem_name; }
- public String getDomain_name() { return domain_name; }
- public void setDomain_name(String domain_name) { this.domain_name =
domain_name; }
- public String getArchitecture_name() { return architecture_name; }
- public void setArchitecture_name(String architecture_name) {
this.architecture_name = architecture_name; }
+ public String getSubnet_name() {
+ return subnet_name;
+ }
+
+ public void setSubnet_name(String subnet_name) {
+ this.subnet_name = subnet_name;
+ }
+
+ public String getOperatingsystem_name() {
+ return operatingsystem_name;
+ }
+
+ public void setOperatingsystem_name(String operatingsystem_name) {
+ this.operatingsystem_name = operatingsystem_name;
+ }
+
+ public String getDomain_name() {
+ return domain_name;
+ }
+
+ public void setDomain_name(String domain_name) {
+ this.domain_name = domain_name;
+ }
+
+ public String getArchitecture_name() {
+ return architecture_name;
+ }
+
+ public void setArchitecture_name(String architecture_name) {
+ this.architecture_name = architecture_name;
+ }
+
public int getPtable_id() {
return ptable_id;
}
+
public void setPtable_id(int ptable_id) {
this.ptable_id = ptable_id;
}
+
public int getMedium_id() {
return medium_id;
}
+
public void setMedium_id(int medium_id) {
this.medium_id = medium_id;
}
- public int getArchitecture_id() { return architecture_id; }
+
+ public int getArchitecture_id() {
+ return architecture_id;
+ }
+
public void setArchitecture_id(int architecture_id) {
this.architecture_id = architecture_id;
}
+
public int getId() {
return id;
}
+
public void setId(int id) {
this.id = id;
}
+
public int getSubnet_id() {
return subnet_id;
}
+
public void setSubnet_id(int subnet_id) {
this.subnet_id = subnet_id;
}
+
public int getOperatingsystem_id() {
return operatingsystem_id;
}
+
public void setOperatingsystem_id(int operatingsystem_id) {
this.operatingsystem_id = operatingsystem_id;
}
+
public int getDomain_id() {
return domain_id;
}
+
public void setDomain_id(int domain_id) {
this.domain_id = domain_id;
}
+
public Map<String, String> getParameters() {
return parameters;
}
+
public void setParameters(Map<String, String> parameters) {
this.parameters = parameters;
}
+
public int[] getPuppetclass_ids() {
return puppetclass_ids;
}
+
public void setPuppetclass_ids(int[] puppetclass_ids) {
this.puppetclass_ids = puppetclass_ids;
}
+
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
+
public int getEnvironment_id() {
return environment_id;
}
+
public void setEnvironment_id(int environment_id) {
this.environment_id = environment_id;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroupWrapper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroupWrapper.java
index 827efa0..1ede4f3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroupWrapper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostGroupWrapper.java
@@ -3,10 +3,13 @@
import org.codehaus.jackson.annotate.JsonProperty;
public class ForemanHostGroupWrapper {
- @JsonProperty("results") private ForemanHostGroup[] results;
- public ForemanHostGroup[] getResults() {
+ @JsonProperty("results")
+ private ForemanHostGroup[] results;
+
+ public ForemanHostGroup[] getResults() {
return results;
}
+
public void setResults(ForemanHostGroup[] hostGroup) {
this.results = hostGroup;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
index e8d31ce..ddcc96f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
@@ -58,7 +58,8 @@
private static final String HOST_GROUPS_ENTRY_POINT = API_ENTRY_POINT +
"/hostgroups";
private static final String HOST_GROUPS_QUERY = HOST_GROUPS_ENTRY_POINT +
"?" + JSON_FORMAT;
- private static final String COMPUTE_RESOURCES_HOSTS_ENTRY_POINT =
API_ENTRY_POINT + "/compute_resources?search=oVirt";
+ private static final String COMPUTE_RESOURCES_HOSTS_ENTRY_POINT =
API_ENTRY_POINT
+ + "/compute_resources?search=oVirt";
private static final String DISCOVERED_HOSTS = "/discovered_hosts";
private static final String DISCOVERED_HOSTS_ENTRY_POINT = API_ENTRY_POINT
+ DISCOVERED_HOSTS;
@@ -73,7 +74,7 @@
}
private List<VDS> runHostListMethod(HttpMethod httpMethod) {
- try{
+ try {
runHttpMethod(httpClient, httpMethod);
ForemanHostWrapper fhw =
objectMapper.readValue(httpMethod.getResponseBody(), ForemanHostWrapper.class);
return mapHosts(Arrays.asList(fhw.getResults()));
@@ -83,7 +84,7 @@
}
private List<ExternalDiscoveredHost>
runDiscoveredHostListMethod(HttpMethod httpMethod) {
- try{
+ try {
runHttpMethod(httpClient, httpMethod);
ForemanDiscoveredHostWrapper fdw =
objectMapper.readValue(httpMethod.getResponseBody(),
ForemanDiscoveredHostWrapper.class);
@@ -94,7 +95,7 @@
}
private List<ExternalHostGroup> runHostGroupListMethod(HttpMethod
httpMethod) {
- try{
+ try {
runHttpMethod(httpClient, httpMethod);
ForemanHostGroupWrapper fhgw =
objectMapper.readValue(httpMethod.getResponseBody(),
ForemanHostGroupWrapper.class);
@@ -105,7 +106,7 @@
}
private List<ExternalOperatingSystem> runOperationSystemMethod(HttpMethod
httpMethod) {
- try{
+ try {
runHttpMethod(httpClient, httpMethod);
ForemanOperatingSystemWrapper fosw =
objectMapper.readValue(httpMethod.getResponseBody(),
ForemanOperatingSystemWrapper.class);
@@ -116,11 +117,11 @@
}
private List<ExternalComputeResource> runComputeResourceMethod(HttpMethod
httpMethod) {
- try{
+ try {
runHttpMethod(httpClient, httpMethod);
ForemanComputerResourceWrapper fcrw =
objectMapper.readValue(httpMethod.getResponseBody(),
ForemanComputerResourceWrapper.class);
- return mapComputeResource(Arrays.asList(fcrw.getResults()));
+ return mapComputeResource(Arrays.asList(fcrw.getResults()));
} catch (Exception e) {
return null;
}
@@ -239,11 +240,11 @@
@Override
public void provisionHost(VDS vds,
- ExternalHostGroup hg,
- ExternalComputeResource computeResource,
- String mac,
- String discoverName,
- String rootPassword) {
+ ExternalHostGroup hg,
+ ExternalComputeResource computeResource,
+ String mac,
+ String discoverName,
+ String rootPassword) {
final String entityBody = "{\n" +
" \"discovered_host\": {\n" +
" \"name\": \"" + vds.getName() + "\",\n" +
@@ -260,7 +261,7 @@
" \"root_pass\": \"" + rootPassword + "\",\n" +
" \"host_parameters_attributes\": [\n" +
" {\n" +
- " \"name\": \"host_ovirt_id\",\n" +
+ " \"name\": \"host_ovirt_id\",\n" +
" \"value\": \"" + vds.getStaticData().getId()
+ "\",\n" +
" \"_destroy\": \"false\",\n" +
" \"nested\": \"\"\n" +
@@ -360,7 +361,10 @@
URL hostUrl = getUrl();
if (isSecured()) {
int hostPort = hostUrl.getPort() == -1 ? HttpsURL.DEFAULT_PORT
: hostUrl.getPort();
- Protocol httpsProtocol = new
Protocol(String.valueOf(HttpsURL.DEFAULT_SCHEME), (ProtocolSocketFactory) new
AuthSSLProtocolSocketFactory(ExternalTrustStoreInitializer.getTrustStore()),
hostPort);
+ Protocol httpsProtocol =
+ new Protocol(String.valueOf(HttpsURL.DEFAULT_SCHEME),
+ (ProtocolSocketFactory) new
AuthSSLProtocolSocketFactory(ExternalTrustStoreInitializer.getTrustStore()),
+ hostPort);
httpClient.getHostConfiguration().setHost(hostUrl.getHost(),
hostPort, httpsProtocol);
} else {
int hostPort = hostUrl.getPort() == -1 ? HttpURL.DEFAULT_PORT
: hostUrl.getPort();
@@ -368,7 +372,8 @@
}
objectMapper.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
if (hostProvider.getUsername() != null &&
hostProvider.getPassword() != null) {
- Credentials hostProviderCredentials = new
UsernamePasswordCredentials(hostProvider.getUsername(),
hostProvider.getPassword());
+ Credentials hostProviderCredentials =
+ new
UsernamePasswordCredentials(hostProvider.getUsername(),
hostProvider.getPassword());
httpClient.getState().setCredentials(AuthScope.ANY,
hostProviderCredentials);
// Required when working with foreman's /api rather than
accessing directly to /hosts
httpClient.getParams().setAuthenticationPreemptive(true);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostWrapper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostWrapper.java
index fe3cd88..96dd5c7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostWrapper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostWrapper.java
@@ -3,7 +3,14 @@
import org.codehaus.jackson.annotate.JsonProperty;
public class ForemanHostWrapper {
- @JsonProperty("results") private ForemanHost[] results;
- public ForemanHost[] getResults() { return results; }
- public void setResults(ForemanHost[] hosts) { this.results = hosts; }
+ @JsonProperty("results")
+ private ForemanHost[] results;
+
+ public ForemanHost[] getResults() {
+ return results;
+ }
+
+ public void setResults(ForemanHost[] hosts) {
+ this.results = hosts;
+ }
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystem.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystem.java
index 92904ae..94e9a85 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystem.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystem.java
@@ -2,7 +2,7 @@
import java.io.Serializable;
-public class ForemanOperatingSystem implements Serializable {
+public class ForemanOperatingSystem implements Serializable {
private static final long serialVersionUID = 5278645435607997741L;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystemWrapper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystemWrapper.java
index de405a2..7d48623 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystemWrapper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanOperatingSystemWrapper.java
@@ -3,10 +3,14 @@
import org.codehaus.jackson.annotate.JsonProperty;
public class ForemanOperatingSystemWrapper {
- @JsonProperty("results") private ForemanOperatingSystem[] results;
- public ForemanOperatingSystem[] getResults() { return results; }
+ @JsonProperty("results")
+ private ForemanOperatingSystem[] results;
+
+ public ForemanOperatingSystem[] getResults() {
+ return results;
+ }
+
public void setResults(ForemanOperatingSystem[] operationsystem) {
this.results = operationsystem;
}
}
-
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
index 892ddf1..c52cdfc 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
@@ -8,17 +8,34 @@
private String provider;
private String user;
- public String getProvider() { return provider; }
- public void setProvider(String provider) { this.provider = provider; }
- public String getUser() { return user; }
- public void setUser(String user) { this.user = user; }
+ public String getProvider() {
+ return provider;
+ }
+
+ public void setProvider(String provider) {
+ this.provider = provider;
+ }
+
+ public String getUser() {
+ return user;
+ }
+
+ public void setUser(String user) {
+ this.user = user;
+ }
+
public String getUrl() {
return url;
}
+
public void setUrl(String url) {
this.url = url;
}
- public int getId() { return id; }
+
+ public int getId() {
+ return id;
+ }
+
public void setId(int id) {
this.id = id;
}
@@ -27,6 +44,7 @@
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
@@ -34,7 +52,7 @@
@Override
public String getDescription() {
return "URL: " + url +
- " | Provider: " + provider + "\n" +
- " | User: " + user;
+ " | Provider: " + provider + "\n" +
+ " | User: " + user;
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
index 3163c98..1cd5950 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
@@ -8,19 +8,34 @@
private String lastReport;
private String subnetName;
- public String getSubnetName() { return subnetName; }
- public void setSubnetName(String subnetName) { this.subnetName =
subnetName; }
- public String getLastReport() { return lastReport; }
- public void setLastReport(String lastReport) { this.lastReport =
lastReport; }
+ public String getSubnetName() {
+ return subnetName;
+ }
+
+ public void setSubnetName(String subnetName) {
+ this.subnetName = subnetName;
+ }
+
+ public String getLastReport() {
+ return lastReport;
+ }
+
+ public void setLastReport(String lastReport) {
+ this.lastReport = lastReport;
+ }
+
public String getMac() {
return mac;
}
+
public void setMac(String mac) {
this.mac = mac;
}
+
public String getIp() {
return ip;
}
+
public void setIp(String ip) {
this.ip = ip;
}
@@ -29,6 +44,7 @@
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
@@ -36,7 +52,7 @@
@Override
public String getDescription() {
return "MAC: " + mac + "\n" +
- " | DiscoverTime : " + lastReport + "\n" +
- " | Subnet: " + subnetName;
+ " | DiscoverTime : " + lastReport + "\n" +
+ " | Subnet: " + subnetName;
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalEntityBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalEntityBase.java
index 0a4813f..41da928 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalEntityBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalEntityBase.java
@@ -4,5 +4,6 @@
public interface ExternalEntityBase extends Serializable {
public abstract String getDescription();
+
public abstract String getName();
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHost.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHost.java
index c88fcc5..db11bc9 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHost.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHost.java
@@ -9,6 +9,7 @@
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
index d0ebff6..524b7ae 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
@@ -21,65 +21,106 @@
private String domainName;
private String architectureName;
- public String getArchitectureName() { return architectureName; }
- public void setArchitectureName(String architectureName) {
this.architectureName = architectureName; }
- public String getDomainName() { return domainName; }
- public void setDomainName(String domainName) { this.domainName =
domainName; }
- public String getOperatingsystemName() { return operatingsystemName; }
- public void setOperatingsystemName(String operatingsystemName) {
this.operatingsystemName = operatingsystemName; }
- public String getSubnetName() { return subnetName; }
- public void setSubnetName(String subnetName) { this.subnetName =
subnetName; }
+ public String getArchitectureName() {
+ return architectureName;
+ }
+
+ public void setArchitectureName(String architectureName) {
+ this.architectureName = architectureName;
+ }
+
+ public String getDomainName() {
+ return domainName;
+ }
+
+ public void setDomainName(String domainName) {
+ this.domainName = domainName;
+ }
+
+ public String getOperatingsystemName() {
+ return operatingsystemName;
+ }
+
+ public void setOperatingsystemName(String operatingsystemName) {
+ this.operatingsystemName = operatingsystemName;
+ }
+
+ public String getSubnetName() {
+ return subnetName;
+ }
+
+ public void setSubnetName(String subnetName) {
+ this.subnetName = subnetName;
+ }
+
public int getHostgroupId() {
return hostgroupId;
}
+
public void setHostgroupId(int id) {
this.hostgroupId = id;
}
+
public int getOsId() {
return osId;
}
+
public void setOsId(int os_id) {
this.osId = os_id;
}
+
public int getSubnetId() {
return subnetId;
}
+
public void setSubnetId(int subnetId) {
this.subnetId = subnetId;
}
+
public int getDomainId() {
return domainId;
}
+
public void setDomainId(int domainId) {
this.domainId = domainId;
}
+
public int getEnvironmentId() {
return environmentId;
}
+
public void setEnvironmentId(int environmentId) {
this.environmentId = environmentId;
}
+
public Map<String, String> getParameters() {
return parameters;
}
+
public void setParameters(Map<String, String> parameters) {
this.parameters = parameters;
}
+
public int getPtableId() {
return ptableId;
}
+
public void setPtableId(int ptableId) {
this.ptableId = ptableId;
}
+
public int getMediumId() {
return mediumId;
}
+
public void setMediumId(int mediumId) {
this.mediumId = mediumId;
}
+
public int getArchitectureId() {
return architectureId;
}
+
public void setArchitectureId(int architectureId) {
this.architectureId = architectureId;
}
@@ -87,15 +128,16 @@
@Override
public String getDescription() {
return "OS: " + operatingsystemName + "\n" +
- " | Subnet: " + subnetName + "\n" +
- " | Domain: " + domainName + "\n" +
- " | Arch: " + architectureName;
+ " | Subnet: " + subnetName + "\n" +
+ " | Domain: " + domainName + "\n" +
+ " | Arch: " + architectureName;
}
@Override
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
index 47f4748..42ce370 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
@@ -11,18 +11,23 @@
public int getMediaId() {
return mediaId;
}
+
public void setMediaId(int mediaId) {
this.mediaId = mediaId;
}
+
public int getId() {
return id;
}
+
public void setId(int id) {
this.id = id;
}
+
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
--
To view, visit http://gerrit.ovirt.org/29548
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b1cc0c30b366e11bb7847a41c6234829a83e0bf
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
