Arik Hadas has uploaded a new change for review.
Change subject: core: OvfReader cleanup
......................................................................
core: OvfReader cleanup
- Rename GigabyteToBytes method to convertGigabyteToBytes
- Rename the methods in IOvfBuilder so that they will start with lower
case letter instead of upper case letter
- Remove unnecessary parentheses
Change-Id: I30cb764dd0a303138b703f1cce1e943fb1e59fc8
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/IOvfBuilder.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.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/OvfVmReader.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
6 files changed, 31 insertions(+), 31 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/10526/1
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/IOvfBuilder.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/IOvfBuilder.java
index 37da935..f5d514e 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/IOvfBuilder.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/IOvfBuilder.java
@@ -13,11 +13,11 @@
public final String VSSD_PREFIX = "vssd";
public final String XSI_PREFIX = "xsi";
- void BuildReference();
+ void buildReference();
- void BuildNetwork();
+ void buildNetwork();
- void BuildDisk();
+ void buildDisk();
- void BuildVirtualSystem();
+ void buildVirtualSystem();
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java
index a0f2bfa..7a9cd7e 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java
@@ -87,9 +87,9 @@
}
private void BuildOvf(IOvfBuilder builder) {
- builder.BuildReference();
- builder.BuildNetwork();
- builder.BuildDisk();
- builder.BuildVirtualSystem();
+ builder.buildReference();
+ builder.buildNetwork();
+ builder.buildDisk();
+ builder.buildVirtualSystem();
}
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
index 35f097a..205f9ce 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
@@ -80,22 +80,22 @@
}
@Override
- public void BuildReference() {
+ public void buildReference() {
buildImageReference();
buildNicReference();
}
@Override
- public void BuildNetwork() {
+ public void buildNetwork() {
// No implementation - networks aren't read from the OVF.
}
- protected long GigabyteToBytes(long gb) {
+ protected long convertGigabyteToBytes(long gb) {
return gb * BYTES_IN_GB;
}
@Override
- public void BuildDisk() {
+ public void buildDisk() {
XmlNodeList list = _document.SelectNodes("//*/Section/Disk");
for (XmlNode node : list) {
final Guid guid = new
Guid(node.Attributes.get("ovf:diskId").getValue());
@@ -112,10 +112,10 @@
}
if
(!StringUtils.isEmpty(node.Attributes.get("ovf:size").getValue())) {
-
image.setsize(GigabyteToBytes(Long.parseLong(node.Attributes.get("ovf:size").getValue())));
+
image.setsize(convertGigabyteToBytes(Long.parseLong(node.Attributes.get("ovf:size").getValue())));
}
if
(!StringUtils.isEmpty(node.Attributes.get("ovf:actual_size").getValue())) {
-
image.setactual_size(GigabyteToBytes(Long.parseLong(node.Attributes.get("ovf:actual_size").getValue())));
+
image.setactual_size(convertGigabyteToBytes(Long.parseLong(node.Attributes.get("ovf:actual_size").getValue())));
}
if (node.Attributes.get("ovf:volume-format") != null) {
if
(!StringUtils.isEmpty(node.Attributes.get("ovf:volume-format").getValue())) {
@@ -172,7 +172,7 @@
}
@Override
- public void BuildVirtualSystem() {
+ public void buildVirtualSystem() {
readGeneralData();
}
@@ -283,9 +283,9 @@
*/
protected abstract String getDefaultDisplayTypeStringRepresentation();
- protected abstract void ReadOsSection(XmlNode section);
+ protected abstract void readOsSection(XmlNode section);
- protected abstract void ReadHardwareSection(XmlNode section);
+ protected abstract void readHardwareSection(XmlNode section);
protected void readGeneralData() {
XmlNode content = _document.SelectSingleNode("//*/Content");
@@ -337,21 +337,21 @@
node = content.SelectSingleNode("initrd_url");
if (node != null) {
if (!StringUtils.isEmpty(node.InnerText)) {
- vmBase.setinitrd_url((node.InnerText));
+ vmBase.setinitrd_url(node.InnerText);
}
}
node = content.SelectSingleNode("kernel_url");
if (node != null) {
if (!StringUtils.isEmpty(node.InnerText)) {
- vmBase.setkernel_url((node.InnerText));
+ vmBase.setkernel_url(node.InnerText);
}
}
node = content.SelectSingleNode("kernel_params");
if (node != null) {
if (!StringUtils.isEmpty(node.InnerText)) {
- vmBase.setkernel_params((node.InnerText));
+ vmBase.setkernel_params(node.InnerText);
}
}
@@ -377,11 +377,11 @@
String value = section.Attributes.get("xsi:type").getValue();
if ("ovf:OperatingSystemSection_Type".equals(value)) {
- ReadOsSection(section);
+ readOsSection(section);
}
else if ("ovf:VirtualHardwareSection_Type".equals(value)) {
- ReadHardwareSection(section);
+ readHardwareSection(section);
} else if ("ovf:SnapshotsSection_Type".equals(value)) {
readSnapshotsSection(section);
}
@@ -526,7 +526,7 @@
// handle interfaces with different sub types : we have 0-3 as the
VmInterfaceType enum
boolean isKnownType = false;
for (VmInterfaceType vmInterfaceType : VmInterfaceType.values()) {
- if ((Integer.valueOf(vmInterfaceType.getValue()) ==
resourceSubType)) {
+ if (Integer.valueOf(vmInterfaceType.getValue()) ==
resourceSubType) {
vmDevice.setDevice(VmDeviceType.BRIDGE.getName());
isKnownType = true;
break;
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 9189fe0..a3a549e 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
@@ -31,7 +31,7 @@
}
@Override
- protected void ReadOsSection(XmlNode section) {
+ protected void readOsSection(XmlNode section) {
_vmTemplate.setId(new
Guid(section.Attributes.get("ovf:id").getValue()));
XmlNode node = section.SelectSingleNode("Description");
if (node != null) {
@@ -42,7 +42,7 @@
}
@Override
- protected void ReadHardwareSection(XmlNode section) {
+ protected void readHardwareSection(XmlNode section) {
XmlNodeList list = section.SelectNodes("Item");
for (XmlNode node : list) {
int resourceType =
Integer.parseInt(node.SelectSingleNode("rasd:ResourceType", _xmlNS).InnerText);
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 a3e9566..394e17f 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
@@ -38,7 +38,7 @@
}
@Override
- protected void ReadOsSection(XmlNode section) {
+ protected void readOsSection(XmlNode section) {
_vm.getStaticData().setId(new
Guid(section.Attributes.get("ovf:id").getValue()));
XmlNode node = section.SelectSingleNode("Description");
if (node != null) {
@@ -49,7 +49,7 @@
}
@Override
- protected void ReadHardwareSection(XmlNode section) {
+ protected void readHardwareSection(XmlNode section) {
XmlNodeList list = section.SelectNodes("Item");
for (XmlNode node : list) {
String resourceType = node.SelectSingleNode("rasd:ResourceType",
_xmlNS).InnerText;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
index ecaa3d8..c180013 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
@@ -71,7 +71,7 @@
}
@Override
- public void BuildReference() {
+ public void buildReference() {
_writer.WriteStartElement("References");
for (DiskImage image : _images) {
_writer.WriteStartElement("File");
@@ -91,7 +91,7 @@
}
@Override
- public void BuildNetwork() {
+ public void buildNetwork() {
_writer.WriteStartElement("Section");
_writer.WriteAttributeString(XSI_URI, "type", OVF_PREFIX +
":NetworkSection_Type");
_writer.WriteStartElement("Info");
@@ -104,7 +104,7 @@
}
@Override
- public void BuildDisk() {
+ public void buildDisk() {
_writer.WriteStartElement("Section");
_writer.WriteAttributeString(XSI_URI, "type", OVF_PREFIX +
":DiskSection_Type");
_writer.WriteStartElement("Info");
@@ -167,7 +167,7 @@
}
@Override
- public void BuildVirtualSystem() {
+ public void buildVirtualSystem() {
// General Vm
_writer.WriteStartElement("Content");
_writer.WriteAttributeString(OVF_URI, "id", "out");
--
To view, visit http://gerrit.ovirt.org/10526
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30cb764dd0a303138b703f1cce1e943fb1e59fc8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
