Yaniv Bronhaim has uploaded a new change for review. Change subject: Adding to VdsStatic ssh_username and ssh_port ......................................................................
Adding to VdsStatic ssh_username and ssh_port Change-Id: Id2c38d23faadc4dbed65d08298e0862c5bea26dd Signed-off-by: Yaniv Bronhaim <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/resources/fixtures.xml M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java 8 files changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/16096/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java index d4dfc74..96cb2ae 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java @@ -105,7 +105,7 @@ } public VDS(Guid vds_group_id, String vds_group_name, String vds_group_description, Guid vds_id, String vds_name, - String ip, String host_name, int port, int status, Integer cpu_cores, Integer cpuThreads, String cpu_model, + String ip, String host_name, int port, String username, int status, Integer cpu_cores, Integer cpuThreads, String cpu_model, String hwManufacturer, String hwProductName, String hwVersion, String hwSerialNumber, String hwUUID, String hwFamily, Double cpu_speed_mh, String if_total_speed, Boolean kvm_enabled, Integer physical_mem_mb, @@ -132,6 +132,7 @@ this.setManagementIp(ip); this.setHostName(host_name); this.setPort(port); + this.setUsername(username); this.setStatus(VDSStatus.forValue(status)); this.setHardwareManufacturer(hwManufacturer); this.setHardwareProductName(hwProductName); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java index b8ecffd..6b69578 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java @@ -61,6 +61,12 @@ message = "VALIDATION.VDS.PORT.RANGE") private int port; + @EditableField + @Size(min = 1, max = BusinessEntitiesDefinitions.HOST_NAME_SIZE) + @Pattern(regexp = ValidationUtils.NO_SPECIAL_CHARACTERS_WITH_DOT, message = "VALIDATION_VDS_USERNAME_INVALID", groups = { + CreateEntity.class, UpdateEntity.class }) + private String username = ""; + @EditableOnVdsStatus private Guid vdsGroupId; @@ -158,7 +164,7 @@ this.vdsSpmPriority = HOST_DEFAULT_SPM_PRIORITY; } - public VdsStatic(String host_name, String ip, String uniqueId, int port, Guid vds_group_id, Guid vds_id, + public VdsStatic(String host_name, String ip, String uniqueId, int port, String username, Guid vds_group_id, Guid vds_id, String vds_name, boolean server_SSL_enabled, VDSType vds_type) { serverSslEnabled = false; vdsStrength = 100; @@ -166,6 +172,7 @@ this.managementIp = ip; this.uniqueId = uniqueId; this.port = port; + this.username = username; this.vdsGroupId = vds_group_id; this.id = vds_id; this.name = vds_name; @@ -214,6 +221,14 @@ public void setPort(int value) { this.port = value; + } + + public String getUsername() { + return this.username; + } + + public void setUsername(String value) { + this.username = value; } public Guid getVdsGroupId() { @@ -497,6 +512,7 @@ result = prime * result + ((pmSecondaryType == null) ? 0 : pmSecondaryType.hashCode()); result = prime * result + ((pmSecondaryUser == null) ? 0 : pmSecondaryUser.hashCode()); result = prime * result + port; + result = prime * result + ((username == null) ? 0 : username.hashCode()); result = prime * result + ((serverSslEnabled == null) ? 0 : serverSslEnabled.hashCode()); result = prime * result + ((uniqueId == null) ? 0 : uniqueId.hashCode()); result = prime * result + ((vdsGroupId == null) ? 0 : vdsGroupId.hashCode()); @@ -539,6 +555,7 @@ && ObjectUtils.objectsEqual(pmSecondaryType, other.pmSecondaryType) && ObjectUtils.objectsEqual(pmSecondaryUser, other.pmSecondaryUser) && port == other.port + && ObjectUtils.objectsEqual(username, other.username) && ObjectUtils.objectsEqual(serverSslEnabled, other.serverSslEnabled) && ObjectUtils.objectsEqual(uniqueId, other.uniqueId) && ObjectUtils.objectsEqual(vdsGroupId, other.vdsGroupId) diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java index e1c1c03..160f6b1 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java @@ -231,6 +231,7 @@ .getBoolean("server_SSL_enabled")); entity.setHostName(rs.getString("host_name")); entity.setPort(rs.getInt("port")); + entity.setUsername(rs.getString("username")); entity.setStatus(VDSStatus.forValue(rs.getInt("status"))); entity.setCpuCores((Integer) rs.getObject("cpu_cores")); entity.setCpuThreads((Integer) rs.getObject("cpu_threads")); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java index 2bf311d..b832cce 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java @@ -72,6 +72,7 @@ .addValue("ip", vds.getManagementIp()) .addValue("vds_unique_id", vds.getUniqueID()) .addValue("port", vds.getPort()) + .addValue("username", vds.getUsername()) .addValue("vds_group_id", vds.getVdsGroupId()) .addValue("vds_id", vds.getId()) .addValue("vds_name", vds.getName()) @@ -122,6 +123,7 @@ entity.setManagementIp(rs.getString("ip")); entity.setUniqueID(rs.getString("vds_unique_id")); entity.setPort(rs.getInt("port")); + entity.setUsername(rs.getString("username")); entity.setVdsGroupId(Guid.createGuidFromString(rs .getString("vds_group_id"))); entity.setId(Guid.createGuidFromString(rs diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index 6b51918..5960ce5 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -897,6 +897,7 @@ <column>vds_unique_id</column> <column>host_name</column> <column>port</column> + <column>username</column> <column>vds_group_id</column> <column>server_SSL_enabled</column> <column>vds_type</column> @@ -926,6 +927,7 @@ <value>farkle</value> <value>magenta-vdsc.redhat.com</value> <value>54321</value> + <value>root</value> <value>b399944a-81ab-4ec5-8266-e19ba7c3c9d1</value> <value>1</value> <value>1</value> @@ -956,6 +958,7 @@ <value>farkle</value> <value>purple-vdsc.redhat.com</value> <value>54321</value> + <value>root</value> <value>b399944a-81ab-4ec5-8266-e19ba7c3c9d2</value> <value>1</value> <value>0</value> @@ -986,6 +989,7 @@ <value>farkle</value> <value>localfs-vds.redhat.com</value> <value>54321</value> + <value>root</value> <value>eba797fb-8e3b-4777-b63c-92e7a5957d7f</value> <value>1</value> <value>1</value> @@ -1016,6 +1020,7 @@ <value>farkle</value> <value>gluster1-vdsc.redhat.com</value> <value>54321</value> + <value>root</value> <value>ae956031-6be2-43d6-bb8f-5191c9253314</value> <value>1</value> <value>1</value> @@ -1046,6 +1051,7 @@ <value>farkle</value> <value>gluster2-vdsc.redhat.com</value> <value>54321</value> + <value>root</value> <value>ae956031-6be2-43d6-bb8f-5191c9253314</value> <value>1</value> <value>1</value> diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index 0df3464..004da68 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -1256,6 +1256,7 @@ <!-- unsigned to avoid issues with port values greater than 32767, e.g. the standard VDSM port 54321 --> <xs:element name="port" type="xs:unsignedShort" minOccurs="0"/> + <xs:element name="username" type="xs:string" minOccurs="0"/> <xs:element name="type" type="xs:string" minOccurs="0"/> <xs:element name="storage_manager" type="StorageManager" minOccurs="0"/> <xs:element name="version" type="Version" minOccurs="0"/> diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java index b00d51e..855d515 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java @@ -48,6 +48,7 @@ public final static Long BYTES_IN_MEGABYTE = 1024L * 1024L; // REVISIT retrieve from configuration private static final int DEFAULT_VDSM_PORT = 54321; + private static final String DEFAULT_ROOT_USERNAME = 'root'; private static final String MD5_FILE_SIGNATURE = "md5"; private static final String MD5_SECURITY_ALGORITHM = "MD5"; @@ -73,6 +74,11 @@ } else { entity.setPort(DEFAULT_VDSM_PORT); } + if (model.isSetUsername() && model.getUsername() > 0) { + entity.setUsername(model.getUsername()); + } else { + entity.setUsername(DEFAULT_ROOT_USERNAME); + } if (model.isSetPowerManagement()) { entity = map(model.getPowerManagement(), entity); } @@ -227,6 +233,7 @@ if (entity.getPort() > 0) { model.setPort(entity.getPort()); } + model.setUsername(entity.getUsername()); HostStatus status = map(entity.getStatus(), null); model.setStatus(StatusUtils.create(status)); if (status==HostStatus.NON_OPERATIONAL) { diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java index 9693d5b..1bc031a 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java @@ -53,6 +53,7 @@ random.nextString(10), random.nextString(10), random.nextInt(), + random.nextString(10), Guid.NewGuid(), Guid.NewGuid(), random.nextString(10), -- To view, visit http://gerrit.ovirt.org/16096 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2c38d23faadc4dbed65d08298e0862c5bea26dd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
