Merge "Fix non-functional driver configuration on Py2"

doc/source/admin/emulator.conf

@@ -2,7 +2,7 @@
 # configuration infrastructure: http://flask.pocoo.org/docs/config/
 
 # Listen on all local IP interfaces
-SUSHY_EMULATOR_LISTEN_IP = ''
+SUSHY_EMULATOR_LISTEN_IP = u''
 
 # Bind to TCP port 8000
 SUSHY_EMULATOR_LISTEN_PORT = 8000
@@ -17,18 +17,18 @@ SUSHY_EMULATOR_SSL_KEY = None
 SUSHY_EMULATOR_OS_CLOUD = None
 
 # The libvirt URI to use. This option enables libvirt driver.
-SUSHY_EMULATOR_LIBVIRT_URI = 'qemu:///system'
+SUSHY_EMULATOR_LIBVIRT_URI = u'qemu:///system'
 
 # The map of firmware loaders dependant on the boot mode and
 # system architecture
 SUSHY_EMULATOR_BOOT_LOADER_MAP = {
-    'Uefi': {
-        'x86_64': '/usr/share/OVMF/OVMF_CODE.fd',
-        'aarch64': '/usr/share/AAVMF/AAVMF_CODE.fd'
+    u'Uefi': {
+        u'x86_64': u'/usr/share/OVMF/OVMF_CODE.fd',
+        u'aarch64': u'/usr/share/AAVMF/AAVMF_CODE.fd'
     },
-    'Legacy': {
-        'x86_64': None,
-        'aarch64': None
+    u'Legacy': {
+        u'x86_64': None,
+        u'aarch64': None
     }
 }
 
@@ -42,10 +42,10 @@ SUSHY_EMULATOR_BOOT_LOADER_MAP = {
 # Manager is configured automatically to manage all available Systems.
 SUSHY_EMULATOR_MANAGERS = [
     {
-        "Id": "BMC",
-        "Name": "Manager",
-        "ServiceEntryPointUUID": "92384634-2938-2342-8820-489239905423",
-        "UUID": "58893887-8974-2487-2389-841168418919"
+        u'Id': u'BMC',
+        u'Name': u'Manager',
+        u'ServiceEntryPointUUID': u'92384634-2938-2342-8820-489239905423',
+        u'UUID': u'58893887-8974-2487-2389-841168418919'
     }
 ]
 
@@ -59,14 +59,14 @@ SUSHY_EMULATOR_MANAGERS = [
 # and Managers.
 SUSHY_EMULATOR_CHASSIS = [
     {
-        "Id": "Chassis",
-        "Name": "Chassis",
-        "UUID": "48295861-2522-3561-6729-621118518810"
+        u'Id': u'Chassis',
+        u'Name': u'Chassis',
+        u'UUID': u'48295861-2522-3561-6729-621118518810'
     }
 ]
 
 # This map contains statically configured Redfish IndicatorLED
-# resource state ("Lit", "Off", "Blinking") keyed by UUIDs of
+# resource state ('Lit', 'Off', 'Blinking') keyed by UUIDs of
 # System and Chassis resources.
 #
 # If this map is not present in the configuration, each
@@ -75,29 +75,29 @@ SUSHY_EMULATOR_CHASSIS = [
 # Redfish client can change IndicatorLED state. The new state
 # is volatile, i.e. it's maintained in process memory.
 SUSHY_EMULATOR_INDICATOR_LEDS = {
-#    "48295861-2522-3561-6729-621118518810": "Blinking"
+#    u'48295861-2522-3561-6729-621118518810': u'Blinking'
 }
 
 # This map contains statically configured virtual media resources.
-# These devices ("Cd", "Floppy", "USBStick") will be exposed by the
+# These devices ('Cd', 'Floppy', 'USBStick') will be exposed by the
 # Manager(s) and possibly used by the System(s) if system emulation
 # backend supports boot image configuration.
 #
 # If this map is not present in the configuration, no virtual
 # media devices will be offered by the emulator.
 SUSHY_EMULATOR_VMEDIA_DEVICES = {
-    "Cd": {
-        "Name": "Virtual CD",
-        "MediaTypes": [
-            "CD",
-            "DVD"
+    u'Cd': {
+        u'Name': 'Virtual CD',
+        u'MediaTypes': [
+            u'CD',
+            u'DVD'
         ]
     },
-    "Floppy": {
-        "Name": "Virtual Removable Media",
-        "MediaTypes": [
-            "Floppy",
-            "USBStick"
+    u'Floppy': {
+        u'Name': u'Virtual Removable Media',
+        u'MediaTypes': [
+            u'Floppy',
+            u'USBStick'
         ]
     }
 }

sushy_tools/emulator/resources/chassis/staticdriver.py

@@ -32,9 +32,9 @@ class StaticDriver(AbstractChassisDriver):
             # Default chassis
             chassis = [
                 {
-                    "Id": "SheetMetalChassis",
-                    "Name": "Chassis",
-                    "UUID": "15693887-7984-9484-3272-842188918912",
+                    u'Id': u'SheetMetalChassis',
+                    u'Name': u'Chassis',
+                    u'UUID': u'15693887-7984-9484-3272-842188918912',
                 }
             ]
 

sushy_tools/emulator/resources/managers/staticdriver.py

@@ -33,11 +33,11 @@ class StaticDriver(AbstractManagersDriver):
             # Default Manager
             managers = [
                 {
-                    "Id": "BMC",
-                    "Name": "Manager",
-                    "ServiceEntryPointUUID": "92384634-2938-2342-"
-                                             "8820-489239905423",
-                    "UUID": "58893887-8974-2487-2389-841168418919",
+                    u'Id': u'BMC',
+                    u'Name': u'Manager',
+                    u'ServiceEntryPointUUID': u'92384634-2938-2342-'
+                                              u'8820-489239905423',
+                    u'UUID': u'58893887-8974-2487-2389-841168418919',
                 }
             ]
 

sushy_tools/emulator/resources/vmedia/staticdriver.py

@@ -47,18 +47,18 @@ class StaticDriver(DriverBase):
             'SUSHY_EMULATOR_VMEDIA_DEVICES')
         if device_types is None:
             device_types = {
-                "Cd": {
-                    "Name": "Virtual CD",
-                    "MediaTypes": [
-                        "CD",
-                        "DVD"
+                u'Cd': {
+                    u'Name': u'Virtual CD',
+                    u'MediaTypes': [
+                        u'CD',
+                        u'DVD'
                     ]
                 },
-                "Floppy": {
-                    "Name": "Virtual Removable Media",
-                    "MediaTypes": [
-                        "Floppy",
-                        "USBStick"
+                u'Floppy': {
+                    u'Name': u'Virtual Removable Media',
+                    u'MediaTypes': [
+                        u'Floppy',
+                        u'USBStick'
                     ]
                 }
             }