Hello Gang Wei,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/14729
to review the following change.
Change subject: tools: Trusted Compute Pools - Open Attestation integration
with oVirt engine proposal
......................................................................
tools: Trusted Compute Pools - Open Attestation integration with oVirt engine
proposal
Detailed description: http://wiki.ovirt.org/Trusted_compute_pools
Add a new flag TrustedService in ovf file to record whether the VM is exported
from a trusted cluster.
Change-Id: I0f42f848798706be58acf1291c1841da1135d76d
Signed-off-by: Jimmy <[email protected]>
Signed-off-by: Zhang Lijuan <[email protected]>
Signed-off-by: Dave Chen <[email protected]>
Signed-off-by: Quan Xu <[email protected]>
---
M backend/manager/dbscripts/create_views.sql
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
9 files changed, 39 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/14729/1
diff --git a/backend/manager/dbscripts/create_views.sql
b/backend/manager/dbscripts/create_views.sql
index 8e9d12d..aa18550 100644
--- a/backend/manager/dbscripts/create_views.sql
+++ b/backend/manager/dbscripts/create_views.sql
@@ -351,6 +351,7 @@
vm_templates.is_auto_suspend as is_auto_suspend,
vm_templates.fail_back as fail_back,
vds_groups.name as vds_group_name,
+ vds_groups.trusted_service as trusted_service,
vm_templates.vm_type as vm_type,
vm_templates.nice_level as nice_level,
storage_pool.id as storage_pool_id,
@@ -529,7 +530,7 @@
vm_static.vmt_guid as vmt_guid, vm_static.os as vm_os,
vm_static.description as vm_description, vm_static.vds_group_id as vds_group_id,
vm_static.domain as vm_domain, vm_static.creation_date
as vm_creation_date, vm_static.auto_startup as auto_startup,
vm_static.is_stateless as is_stateless, vm_static.is_smartcard_enabled as
is_smartcard_enabled, vm_static.is_delete_protected as is_delete_protected,
vm_static.dedicated_vm_for_vds as dedicated_vm_for_vds,
vm_static.fail_back as fail_back,
vm_static.default_boot_sequence as default_boot_sequence, vm_static.vm_type as
vm_type,
- vds_groups.name as vds_group_name,
vds_groups.selection_algorithm as selection_algorithm,
vds_groups.transparent_hugepages as transparent_hugepages,
+ vds_groups.name as vds_group_name,
vds_groups.selection_algorithm as selection_algorithm,
vds_groups.transparent_hugepages as transparent_hugepages,
vds_groups.trusted_service as trusted_service,
storage_pool.id as storage_pool_id,
storage_pool.name as storage_pool_name,
vds_groups.description as vds_group_description,
vm_templates.vm_name as vmt_name,
vm_templates.mem_size_mb as vmt_mem_size_mb,
vm_templates.os as vmt_os, vm_templates.creation_date as vmt_creation_date,
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
index 877867c..451c669 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
@@ -1288,6 +1288,16 @@
this.transparentHugePages = value;
}
+ private boolean trustedService;
+
+ public void setTrustedService(boolean trustedService) {
+ this.trustedService = trustedService;
+ }
+
+ public boolean supportsTrustedService() {
+ return trustedService;
+ }
+
@Override
public Object getQueryableId() {
return getId();
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
index 01f2be2..8c71b3e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
@@ -32,6 +32,8 @@
private String vdsGroupName;
+ private boolean trustedService;
+
private NGuid storagePoolId;
private String storagePoolName;
@@ -126,6 +128,14 @@
vdsGroupName = value;
}
+ public void setTrustedService(boolean trustedService) {
+ this.trustedService = trustedService;
+ }
+
+ public boolean supportsTrustedService() {
+ return trustedService;
+ }
+
@Override
public List<VmNetworkInterface> getInterfaces() {
return interfaces;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
index da73429..a27cbec 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
@@ -404,6 +404,7 @@
entity.setTunnelMigration((Boolean)
rs.getObject("tunnel_migration"));
entity.setVncKeyboardLayout(rs.getString("vnc_keyboard_layout"));
entity.setRunAndPause(rs.getBoolean("is_run_and_pause"));
+ entity.setTrustedService(rs.getBoolean("trusted_service"));
return entity;
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
index 607b33c..5eba654 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
@@ -235,6 +235,7 @@
entity.setTunnelMigration((Boolean)
rs.getObject("tunnel_migration"));
entity.setVncKeyboardLayout(rs.getString("vnc_keyboard_layout"));
entity.setMinAllocatedMem(rs.getInt("min_allocated_mem"));
+ entity.setTrustedService(rs.getBoolean("trusted_service"));
return entity;
}
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
index a32fbf7..03f720e 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
@@ -162,6 +162,11 @@
if (node != null) {
_vmTemplate.setDisabled(Boolean.parseBoolean(node.InnerText));
}
+
+ node = content.SelectSingleNode("TrustedService");
+ if (node != null) {
+ _vmTemplate.setTrustedService(Boolean.parseBoolean(node.InnerText));
+ }
}
@Override
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
index dc7b7e4..91e7c89 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
@@ -36,6 +36,9 @@
_writer.WriteStartElement("IsDisabled");
_writer.WriteRaw(String.valueOf(_vmTemplate.isDisabled()));
_writer.WriteEndElement();
+ _writer.WriteStartElement("TrustedService");
+ _writer.WriteRaw(String.valueOf(_vmTemplate.supportsTrustedService()));
+ _writer.WriteEndElement();
}
@Override
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
index 670cc44..4af6d74 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
@@ -203,6 +203,10 @@
_vm.setAppList(_images.get(0).getAppList());
}
}
+ node = content.SelectSingleNode("TrustedService");
+ if (node != null) {
+ _vm.setTrustedService(Boolean.parseBoolean(node.InnerText));
+ }
}
@Override
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
index 54caed0..3d62c4b 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
@@ -57,6 +57,9 @@
_writer.WriteStartElement("DefaultDisplayType");
_writer.WriteRaw(String.valueOf(_vm.getDefaultDisplayType().getValue()));
_writer.WriteEndElement();
+ _writer.WriteStartElement("TrustedService");
+ _writer.WriteRaw(String.valueOf(_vm.supportsTrustedService()));
+ _writer.WriteEndElement();
OvfLogEventHandler<VmStatic> handler = new
VMStaticOvfLogHandler(_vm.getStaticData());
// Gets a map that its keys are aliases to fields that should be OVF
// logged.
--
To view, visit http://gerrit.ovirt.org/14729
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f42f848798706be58acf1291c1841da1135d76d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Dave Chen <[email protected]>
Gerrit-Reviewer: Gang Wei <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
