[Engine-patches] Change in ovirt-engine[master]: core: Typos and minor fixes in OvfReader/Writer

[smelamud]

Hello Shmuel Melamud,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/40236

to review the following change.

Change subject: core: Typos and minor fixes in OvfReader/Writer
......................................................................

core: Typos and minor fixes in OvfReader/Writer

In OvfReader: doc comment fix and fixed typo in
OvfReader.getNetwotkInterface() method name.

In OvfTemplateWriter: using _vmTemplate instead of vmBase for
consistency - both variables point to the same object. Fixed typo in
comment.

In OvfVmWriter: fixed typo in comment.

Change-Id: I06d45d1a5b5cef641b01164a2c2b797bdff3d021
Signed-off-by: Shmuel Melamud <smela...@redhat.com>
---
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/OvfTemplateWriter.java
M 
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
3 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/40236/1

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 790eb4d..f1883a3 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
@@ -214,7 +214,6 @@
      * Reads vm device attributes from OVF and stores it in the collection
      *
      * @param node
-     * @param vmBase
      * @param deviceId
      */
     private VmDevice readVmDevice(XmlNode node, Guid deviceId) {
@@ -294,7 +293,7 @@
      *            the xml node
      * @return VmNetworkInterface
      */
-    public VmNetworkInterface getNetwotkInterface(XmlNode node) {
+    public VmNetworkInterface getNetworkInterface(XmlNode node) {
         // prior to 3.0 the instanceId is int , in 3.1 and on this is Guid
         String str = node.SelectSingleNode("rasd:InstanceId", 
_xmlNS).innerText;
         final Guid guid;
@@ -415,7 +414,7 @@
     }
 
     private void readNetworkItem(XmlNode node) {
-        VmNetworkInterface iface = getNetwotkInterface(node);
+        VmNetworkInterface iface = getNetworkInterface(node);
         updateSingleNic(node, iface);
         vmBase.getInterfaces().add(iface);
         readManagedVmDevice(node, iface.getId());
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 b49dd46..50d0103 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
@@ -250,10 +250,10 @@
         // monitors
         writeMonitors(_vmTemplate);
         // graphics
-        writeGraphics(vmBase);
+        writeGraphics(_vmTemplate);
         // CD
         writeCd(_vmTemplate);
-        // ummanged devices
+        // unmanaged devices
         writeOtherDevices(_vmTemplate, _writer);
 
         // End hardware section
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 1b041de..5d8bb41 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
@@ -344,7 +344,7 @@
         writeGraphics(vmBase);
         // CD
         writeCd(vmBase);
-        // ummanged devices
+        // unmanaged devices
         writeOtherDevices(vmBase, _writer);
 
         // End hardware section


-- 
To view, visit https://gerrit.ovirt.org/40236
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06d45d1a5b5cef641b01164a2c2b797bdff3d021
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shmuel Leib Melamud <smela...@redhat.com>
Gerrit-Reviewer: Shmuel Melamud <smela...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches