From 99bab1b99bf4388a0dba89300c4fb71095681276 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Thu, 19 May 2011 16:25:57 -0400
Subject: Moved back templates and fixed pep8 issue. Template move was due to
 breaking packaging with template moves. That will need to happen in a later
 merge.

---
 MANIFEST.in                            |   3 +-
 nova/virt/cpuinfo.xml.template         |   9 +++
 nova/virt/libvirt.xml.template         | 122 +++++++++++++++++++++++++++++++++
 nova/virt/libvirt/connection.py        |   5 +-
 nova/virt/libvirt/cpuinfo.xml.template |   9 ---
 nova/virt/libvirt/libvirt.xml.template | 122 ---------------------------------
 nova/virt/libvirt/netutils.py          |   4 +-
 7 files changed, 137 insertions(+), 137 deletions(-)
 create mode 100644 nova/virt/cpuinfo.xml.template
 create mode 100644 nova/virt/libvirt.xml.template
 delete mode 100644 nova/virt/libvirt/cpuinfo.xml.template
 delete mode 100644 nova/virt/libvirt/libvirt.xml.template

diff --git a/MANIFEST.in b/MANIFEST.in
index fc4492754..e7a6e7da4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -24,7 +24,8 @@ include nova/console/xvp.conf.template
 include nova/db/sqlalchemy/migrate_repo/migrate.cfg
 include nova/db/sqlalchemy/migrate_repo/README
 include nova/virt/interfaces.template
-include nova/virt/libvirt/*.template
+include nova/virt/libvirt*.xml.template
+include nova/virt/cpuinfo.xml.template
 include nova/tests/CA/
 include nova/tests/CA/cacert.pem
 include nova/tests/CA/private/
diff --git a/nova/virt/cpuinfo.xml.template b/nova/virt/cpuinfo.xml.template
new file mode 100644
index 000000000..48842b29d
--- /dev/null
+++ b/nova/virt/cpuinfo.xml.template
@@ -0,0 +1,9 @@
+<cpu>
+    <arch>$arch</arch>
+    <model>$model</model>
+    <vendor>$vendor</vendor>
+    <topology sockets="$topology.sockets" cores="$topology.cores" threads="$topology.threads"/>
+#for $var in $features
+    <features name="$var" />
+#end for
+</cpu>
diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
new file mode 100644
index 000000000..de2497a76
--- /dev/null
+++ b/nova/virt/libvirt.xml.template
@@ -0,0 +1,122 @@
+<domain type='${type}'>
+    <name>${name}</name>
+    <memory>${memory_kb}</memory>
+    <os>
+#if $type == 'lxc'
+    #set $disk_prefix = ''
+    #set $disk_bus = ''
+        <type>exe</type>
+        <init>/sbin/init</init>
+#else if $type == 'uml'
+    #set $disk_prefix = 'ubd'
+    #set $disk_bus = 'uml'
+        <type>uml</type>
+        <kernel>/usr/bin/linux</kernel>
+        <root>/dev/ubda</root>
+#else
+    #if $type == 'xen'
+        #set $disk_prefix = 'sd'
+        #set $disk_bus = 'scsi'
+            <type>linux</type>
+            <root>/dev/xvda</root>
+    #else
+        #set $disk_prefix = 'vd'
+        #set $disk_bus = 'virtio'
+            <type>hvm</type>
+    #end if
+    #if $getVar('rescue', False)
+        <kernel>${basepath}/kernel.rescue</kernel>
+        <initrd>${basepath}/ramdisk.rescue</initrd>
+    #else
+        #if $getVar('kernel', None)
+            <kernel>${kernel}</kernel>
+            #if $type == 'xen'
+                <cmdline>ro</cmdline>
+            #else
+                <cmdline>root=/dev/vda console=ttyS0</cmdline>
+            #end if
+            #if $getVar('ramdisk', None)
+                <initrd>${ramdisk}</initrd>
+            #end if
+        #else
+            <boot dev="hd" />
+        #end if
+    #end if
+#end if
+    </os>
+    <features>
+        <acpi/>
+    </features>
+    <vcpu>${vcpus}</vcpu>
+    <devices>
+#if $type == 'lxc'
+        <filesystem type='mount'>
+            <source dir='${basepath}/rootfs'/>
+            <target dir='/'/>
+        </filesystem>
+#else
+    #if $getVar('rescue', False)
+        <disk type='file'>
+            <driver type='${driver_type}'/>
+            <source file='${basepath}/disk.rescue'/>
+            <target dev='${disk_prefix}a' bus='${disk_bus}'/>
+        </disk>
+        <disk type='file'>
+            <driver type='${driver_type}'/>
+            <source file='${basepath}/disk'/>
+            <target dev='${disk_prefix}b' bus='${disk_bus}'/>
+        </disk>
+    #else
+        <disk type='file'>
+            <driver type='${driver_type}'/>
+            <source file='${basepath}/disk'/>
+            <target dev='${disk_prefix}a' bus='${disk_bus}'/>
+        </disk>
+        #if $getVar('local', False)
+            <disk type='file'>
+                <driver type='${driver_type}'/>
+                <source file='${basepath}/disk.local'/>
+                <target dev='${disk_prefix}b' bus='${disk_bus}'/>
+            </disk>
+        #end if
+    #end if
+#end if
+
+#for $nic in $nics
+        <interface type='bridge'>
+            <source bridge='${nic.bridge_name}'/>
+            <mac address='${nic.mac_address}'/>
+            <!--   <model type='virtio'/>  CANT RUN virtio network right now -->
+            <filterref filter="nova-instance-${name}-${nic.id}">
+                <parameter name="IP" value="${nic.ip_address}" />
+                <parameter name="DHCPSERVER" value="${nic.dhcp_server}" />
+#if $getVar('nic.extra_params', False)
+                ${nic.extra_params}
+#end if
+#if $getVar('nic.gateway_v6', False)
+                <parameter name="RASERVER" value="${nic.gateway_v6}" />
+#end if
+            </filterref>
+        </interface>
+#end for
+        <!-- The order is significant here.  File must be defined first -->
+        <serial type="file">
+            <source path='${basepath}/console.log'/>
+            <target port='1'/>
+        </serial>
+
+        <console type='pty' tty='/dev/pts/2'>
+            <source path='/dev/pts/2'/>
+            <target port='0'/>
+        </console>
+
+        <serial type='pty'>
+            <source path='/dev/pts/2'/>
+            <target port='0'/>
+        </serial>
+
+#if $getVar('vncserver_host', False)
+        <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vncserver_host}'/>
+#end if
+    </devices>
+</domain>
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 87ba3fec3..94a703954 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -57,7 +57,6 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import ipv6
 from nova import log as logging
 from nova import utils
 from nova import vnc
@@ -85,7 +84,7 @@ flags.DEFINE_string('rescue_image_id', 'ami-rescue', 'Rescue ami image')
 flags.DEFINE_string('rescue_kernel_id', 'aki-rescue', 'Rescue aki image')
 flags.DEFINE_string('rescue_ramdisk_id', 'ari-rescue', 'Rescue ari image')
 flags.DEFINE_string('libvirt_xml_template',
-                    utils.abspath('virt/libvirt/libvirt.xml.template'),
+                    utils.abspath('virt/libvirt.xml.template'),
                     'Libvirt XML Template')
 flags.DEFINE_string('libvirt_type',
                     'kvm',
@@ -108,7 +107,7 @@ flags.DEFINE_string('firewall_driver',
                     'nova.virt.libvirt.firewall.IptablesFirewallDriver',
                     'Firewall driver (defaults to iptables)')
 flags.DEFINE_string('cpuinfo_xml_template',
-                    utils.abspath('virt/libvirt/cpuinfo.xml.template'),
+                    utils.abspath('virt/cpuinfo.xml.template'),
                     'CpuInfo XML Template (Used only live migration now)')
 flags.DEFINE_string('live_migration_uri',
                     "qemu+tcp://%s/system",
diff --git a/nova/virt/libvirt/cpuinfo.xml.template b/nova/virt/libvirt/cpuinfo.xml.template
deleted file mode 100644
index 48842b29d..000000000
--- a/nova/virt/libvirt/cpuinfo.xml.template
+++ /dev/null
@@ -1,9 +0,0 @@
-<cpu>
-    <arch>$arch</arch>
-    <model>$model</model>
-    <vendor>$vendor</vendor>
-    <topology sockets="$topology.sockets" cores="$topology.cores" threads="$topology.threads"/>
-#for $var in $features
-    <features name="$var" />
-#end for
-</cpu>
diff --git a/nova/virt/libvirt/libvirt.xml.template b/nova/virt/libvirt/libvirt.xml.template
deleted file mode 100644
index de2497a76..000000000
--- a/nova/virt/libvirt/libvirt.xml.template
+++ /dev/null
@@ -1,122 +0,0 @@
-<domain type='${type}'>
-    <name>${name}</name>
-    <memory>${memory_kb}</memory>
-    <os>
-#if $type == 'lxc'
-    #set $disk_prefix = ''
-    #set $disk_bus = ''
-        <type>exe</type>
-        <init>/sbin/init</init>
-#else if $type == 'uml'
-    #set $disk_prefix = 'ubd'
-    #set $disk_bus = 'uml'
-        <type>uml</type>
-        <kernel>/usr/bin/linux</kernel>
-        <root>/dev/ubda</root>
-#else
-    #if $type == 'xen'
-        #set $disk_prefix = 'sd'
-        #set $disk_bus = 'scsi'
-            <type>linux</type>
-            <root>/dev/xvda</root>
-    #else
-        #set $disk_prefix = 'vd'
-        #set $disk_bus = 'virtio'
-            <type>hvm</type>
-    #end if
-    #if $getVar('rescue', False)
-        <kernel>${basepath}/kernel.rescue</kernel>
-        <initrd>${basepath}/ramdisk.rescue</initrd>
-    #else
-        #if $getVar('kernel', None)
-            <kernel>${kernel}</kernel>
-            #if $type == 'xen'
-                <cmdline>ro</cmdline>
-            #else
-                <cmdline>root=/dev/vda console=ttyS0</cmdline>
-            #end if
-            #if $getVar('ramdisk', None)
-                <initrd>${ramdisk}</initrd>
-            #end if
-        #else
-            <boot dev="hd" />
-        #end if
-    #end if
-#end if
-    </os>
-    <features>
-        <acpi/>
-    </features>
-    <vcpu>${vcpus}</vcpu>
-    <devices>
-#if $type == 'lxc'
-        <filesystem type='mount'>
-            <source dir='${basepath}/rootfs'/>
-            <target dir='/'/>
-        </filesystem>
-#else
-    #if $getVar('rescue', False)
-        <disk type='file'>
-            <driver type='${driver_type}'/>
-            <source file='${basepath}/disk.rescue'/>
-            <target dev='${disk_prefix}a' bus='${disk_bus}'/>
-        </disk>
-        <disk type='file'>
-            <driver type='${driver_type}'/>
-            <source file='${basepath}/disk'/>
-            <target dev='${disk_prefix}b' bus='${disk_bus}'/>
-        </disk>
-    #else
-        <disk type='file'>
-            <driver type='${driver_type}'/>
-            <source file='${basepath}/disk'/>
-            <target dev='${disk_prefix}a' bus='${disk_bus}'/>
-        </disk>
-        #if $getVar('local', False)
-            <disk type='file'>
-                <driver type='${driver_type}'/>
-                <source file='${basepath}/disk.local'/>
-                <target dev='${disk_prefix}b' bus='${disk_bus}'/>
-            </disk>
-        #end if
-    #end if
-#end if
-
-#for $nic in $nics
-        <interface type='bridge'>
-            <source bridge='${nic.bridge_name}'/>
-            <mac address='${nic.mac_address}'/>
-            <!--   <model type='virtio'/>  CANT RUN virtio network right now -->
-            <filterref filter="nova-instance-${name}-${nic.id}">
-                <parameter name="IP" value="${nic.ip_address}" />
-                <parameter name="DHCPSERVER" value="${nic.dhcp_server}" />
-#if $getVar('nic.extra_params', False)
-                ${nic.extra_params}
-#end if
-#if $getVar('nic.gateway_v6', False)
-                <parameter name="RASERVER" value="${nic.gateway_v6}" />
-#end if
-            </filterref>
-        </interface>
-#end for
-        <!-- The order is significant here.  File must be defined first -->
-        <serial type="file">
-            <source path='${basepath}/console.log'/>
-            <target port='1'/>
-        </serial>
-
-        <console type='pty' tty='/dev/pts/2'>
-            <source path='/dev/pts/2'/>
-            <target port='0'/>
-        </console>
-
-        <serial type='pty'>
-            <source path='/dev/pts/2'/>
-            <target port='0'/>
-        </serial>
-
-#if $getVar('vncserver_host', False)
-        <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vncserver_host}'/>
-#end if
-    </devices>
-</domain>
diff --git a/nova/virt/libvirt/netutils.py b/nova/virt/libvirt/netutils.py
index 9225d8929..4d596078a 100644
--- a/nova/virt/libvirt/netutils.py
+++ b/nova/virt/libvirt/netutils.py
@@ -26,6 +26,7 @@ import IPy
 from nova import context
 from nova import db
 from nova import flags
+from nova import ipv6
 from nova import utils
 
 
@@ -46,6 +47,7 @@ def get_ip_version(cidr):
     net = IPy.IP(cidr)
     return int(net.version())
 
+
 def get_network_info(instance):
     # TODO(adiantum) If we will keep this function
     # we should cache network_info
@@ -93,5 +95,3 @@ def get_network_info(instance):
 
         network_info.append((network, mapping))
     return network_info
-
-
-- 
cgit