Merge "Added PRSM to HVType class for support PR/SM hypervisor"

nova/objects/fields.py

@@ -358,10 +358,11 @@ class HVType(BaseNovaEnum):
     VMWARE = 'vmware'
     XEN = 'xen'
     ZVM = 'zvm'
+    PRSM = 'prsm'
 
     ALL = (BAREMETAL, BHYVE, DOCKER, FAKE, HYPERV, IRONIC, KQEMU, KVM, LXC,
            LXD, OPENVZ, PARALLELS, PHYP, QEMU, TEST, UML, VBOX, VIRTUOZZO,
-           VMWARE, XEN, ZVM)
+           VMWARE, XEN, ZVM, PRSM)
 
     def coerce(self, obj, attr, value):
         try:

nova/tests/unit/objects/test_objects.py

@@ -1092,10 +1092,10 @@ object_data = {
     'FloatingIPList': '1.11-7f2ba670714e1b7bab462ab3290f7159',
     'HostMapping': '1.0-1a3390a696792a552ab7bd31a77ba9ac',
     'HyperVLiveMigrateData': '1.1-9987a3cec31a81abac6fba7cc722e43f',
-    'HVSpec': '1.2-e6cf4455367f301baa926e3972978d55',
+    'HVSpec': '1.2-de06bcec472a2f04966b855a49c46b41',
     'IDEDeviceBus': '1.0-29d4c9f27ac44197f01b6ac1b7e16502',
     'ImageMeta': '1.8-642d1b2eb3e880a367f37d72dd76162d',
-    'ImageMetaProps': '1.15-070af88560aebda534a5d57e0d26e795',
+    'ImageMetaProps': '1.15-89dcdd30b2ec5995a45c8da73c9e1eb9',
     'Instance': '2.3-4f98ab23f4b0a25fabb1040c8f5edecc',
     'InstanceAction': '1.1-f9f293e526b66fca0d05c3b3a2d13914',
     'InstanceActionEvent': '1.1-e56a64fa4710e43ef7af2ad9d6028b33',