[Libvirt-cim] [PATCH 3 of 5] Remove migration related super classes
Kaitlin Rupert
kaitlin at linux.vnet.ibm.com
Mon May 18 23:39:46 UTC 2009
# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1242225647 25200
# Node ID 278f70bf80e0b192f79d9af225b161ea795e852a
# Parent 1492b21f3650f7febcfcade71c75b58a6c25982f
Remove migration related super classes
These classes are now a part of the 2.21 schema. Also remove the TransportType
attribute - this is part of the VirtualSystemMigrationSettingData class.
The valuemap has changed, so the UNIX transport type needs to have a value of
32768 instead of 6.
Add new parameters to migration methods - make these optional since we don't
currently use them.
Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
diff -r 1492b21f3650 -r 278f70bf80e0 schema/VSMigrationCapabilities.mof
--- a/schema/VSMigrationCapabilities.mof Wed May 13 07:40:47 2009 -0700
+++ b/schema/VSMigrationCapabilities.mof Wed May 13 07:40:47 2009 -0700
@@ -1,15 +1,5 @@
// Copyright IBM Corp. 2007
-class CIM_VirtualSystemMigrationCapabilities : CIM_Capabilities {
-
- uint16 DestinationHostFormatsSupported[];
-
- uint16 SynchronousMethodsSupported[];
-
- uint16 AsynchronousMethodsSupported[];
-
-};
-
[Provider("cmpi::Virt_VSMigrationCapabilities")]
class Xen_VirtualSystemMigrationCapabilities : CIM_VirtualSystemMigrationCapabilities {
};
diff -r 1492b21f3650 -r 278f70bf80e0 schema/VSMigrationService.mof
--- a/schema/VSMigrationService.mof Wed May 13 07:40:47 2009 -0700
+++ b/schema/VSMigrationService.mof Wed May 13 07:40:47 2009 -0700
@@ -1,70 +1,5 @@
// Copyright IBM Corp. 2007
-// Placeholder definition until schema is available upstream
-
-class CIM_VirtualSystemMigrationService : CIM_Service {
- uint32 CheckVirtualSystemIsMigratableToHost(
- [In]
- CIM_ComputerSystem REF ComputerSystem,
- [In]
- string DestinationHost,
- [In, EmbeddedInstance("CIM_SettingData")]
- string MigrationSettingData,
- [In, EmbeddedInstance("CIM_VirtualSystemSettingData")]
- string NewSystemSettingData,
- [In, EmbeddedInstance("CIM_ResourceAllocationSettingData")]
- string NewResourceSettingData[],
- [Out]
- boolean IsMigratable
- );
-
- uint32 CheckVirtualSystemIsMigratableToSystem(
- [In]
- CIM_ComputerSystem REF ComputerSystem,
- [In]
- CIM_System REF DestinationSystem,
- [In, EmbeddedInstance("CIM_SettingData")]
- string MigrationSettingData,
- [In, EmbeddedInstance("CIM_VirtualSystemSettingData")]
- string NewSystemSettingData,
- [In, EmbeddedInstance("CIM_ResourceAllocationSettingData")]
- string NewResourceSettingData[],
- [Out]
- boolean IsMigratable
- );
-
-
- uint32 MigrateVirtualSystemToHost(
- [In]
- CIM_ComputerSystem REF ComputerSystem,
- [In]
- string DestinationHost,
- [In, EmbeddedInstance("CIM_SettingData")]
- string MigrationSettingData,
- [In, EmbeddedInstance("CIM_VirtualSystemSettingData")]
- string NewSystemSettingData,
- [In, EmbeddedInstance("CIM_ResourceAllocationSettingData")]
- string NewResourceSettingData[],
- [Out]
- CIM_ConcreteJob REF Job
- );
-
- uint32 MigrateVirtualSystemToSystem(
- [In]
- CIM_ComputerSystem REF ComputerSystem,
- [In]
- CIM_System REF DestinationSystem,
- [In, EmbeddedInstance("CIM_SettingData")]
- string MigrationSettingData,
- [In, EmbeddedInstance("CIM_VirtualSystemSettingData")]
- string NewSystemSettingData,
- [In, EmbeddedInstance("CIM_ResourceAllocationSettingData")]
- string NewResourceSettingData[],
- [Out]
- CIM_ConcreteJob REF Job
- );
-};
-
class Xen_MigrationJob : CIM_ConcreteJob {
};
diff -r 1492b21f3650 -r 278f70bf80e0 schema/VSMigrationSettingData.mof
--- a/schema/VSMigrationSettingData.mof Wed May 13 07:40:47 2009 -0700
+++ b/schema/VSMigrationSettingData.mof Wed May 13 07:40:47 2009 -0700
@@ -1,45 +1,16 @@
// Copyright IBM Corp. 2007
-class CIM_VirtualSystemMigrationSettingData : CIM_SettingData {
- [ Description(
- "MigrationType describes a type of migration operation "
- "to be performed.\n"
- "A value of 2 - Virtual System is to be migrated in a 'live' "
- "manner such that the running of the Virtual System is "
- "minimally impacted during the move.\n"
- "A value of 3 - Virtual System will be temporarily paused "
- "prior to migration and then resume running after it is "
- "moved.\n"
- "A value of 4 - The Virtual System will be quiesced to a "
- "stopped state prior to migration and then restarted after "
- "it is moved."),
- ValueMap {"0","1","2","3","4"},
- Values { "Unknown", "Other", "Live", "Resume", "Restart" }]
- uint16 MigrationType;
-
- uint16 Priority;
-};
-
[Provider("cmpi::Virt_VSMigrationSettingData")]
class Xen_VirtualSystemMigrationSettingData : CIM_VirtualSystemMigrationSettingData {
- [ ValueMap {"0","1","2","3","4","5","6"},
- Values { "Unknown", "Other", "SSH", "TLS", "TLS Strict", "TCP", "UNIX" }]
- uint16 TransportType;
string CheckParameters[];
};
[Provider("cmpi::Virt_VSMigrationSettingData")]
class KVM_VirtualSystemMigrationSettingData : CIM_VirtualSystemMigrationSettingData {
- [ ValueMap {"0","1","2","3","4","5","6"},
- Values { "Unknown", "Other", "SSH", "TLS", "TLS Strict", "TCP", "UNIX" }]
- uint16 TransportType;
string CheckParameters[];
};
[Provider("cmpi::Virt_VSMigrationSettingData")]
class LXC_VirtualSystemMigrationSettingData : CIM_VirtualSystemMigrationSettingData {
- [ ValueMap {"0","1","2","3","4","5","6"},
- Values { "Unknown", "Other", "SSH", "TLS", "TLS Strict", "TCP", "UNIX" }]
- uint16 TransportType;
string CheckParameters[];
};
diff -r 1492b21f3650 -r 278f70bf80e0 src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c Wed May 13 07:40:47 2009 -0700
+++ b/src/Virt_VSMigrationService.c Wed May 13 07:40:47 2009 -0700
@@ -1510,6 +1510,8 @@
.args = {{"ComputerSystem", CMPI_ref, false},
{"DestinationHost", CMPI_string, false},
{"MigrationSettingData", CMPI_instance, true},
+ {"NewSystemSettingData", CMPI_instance, true},
+ {"NewResourceSettingData", CMPI_instanceA, true},
ARG_END
}
};
@@ -1520,6 +1522,8 @@
.args = {{"ComputerSystem", CMPI_ref, false},
{"DestinationSystem", CMPI_ref, false},
{"MigrationSettingData", CMPI_instance, true},
+ {"NewSystemSettingData", CMPI_instance, true},
+ {"NewResourceSettingData", CMPI_instanceA, true},
ARG_END
}
};
@@ -1530,6 +1534,8 @@
.args = {{"ComputerSystem", CMPI_ref, false},
{"DestinationHost", CMPI_string, false},
{"MigrationSettingData", CMPI_instance, true},
+ {"NewSystemSettingData", CMPI_instance, true},
+ {"NewResourceSettingData", CMPI_instanceA, true},
ARG_END
}
};
@@ -1540,6 +1546,8 @@
.args = {{"ComputerSystem", CMPI_ref, false},
{"DestinationSystem", CMPI_ref, false},
{"MigrationSettingData", CMPI_instance, true},
+ {"NewSystemSettingData", CMPI_instance, true},
+ {"NewResourceSettingData", CMPI_instanceA, true},
ARG_END
}
};
diff -r 1492b21f3650 -r 278f70bf80e0 src/Virt_VSMigrationSettingData.h
--- a/src/Virt_VSMigrationSettingData.h Wed May 13 07:40:47 2009 -0700
+++ b/src/Virt_VSMigrationSettingData.h Wed May 13 07:40:47 2009 -0700
@@ -30,7 +30,7 @@
CIM_MIGRATE_URI_TLS = 3,
CIM_MIGRATE_URI_TLS_STRICT = 4,
CIM_MIGRATE_URI_TCP = 5,
- CIM_MIGRATE_URI_UNIX = 6,
+ CIM_MIGRATE_URI_UNIX = 32768,
} transport_type;
CMPIStatus get_migration_sd(const CMPIObjectPath *ref,
More information about the Libvirt-cim
mailing list