Menu
▾
▴
omc-commit
|
From: <jc...@us...> - 2008-04-23 17:47:01
|
Revision: 582
http://omc.svn.sourceforge.net/omc/?rev=582&view=rev
Author: jcarey
Date: 2008-04-23 10:45:50 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Clean up for initial import
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-23 17:27:53 UTC (rev 581)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-23 17:45:50 UTC (rev 582)
@@ -1,15 +1,10 @@
-// Import DMTF dependencies
-#pragma include ("./dmtf/CIM_VirtualSystemSettingData.mof")
-#pragma include ("./dmtf/CIM_Job.mof")
-
// Import OMC VM Builder schema
-#pragma include ("XEN_VMBuilderJob.mof")
#pragma include ("XEN_VMBuilderService.mof")
+#pragma include ("XEN_VMBuilderJob.mof")
#pragma include ("XEN_VMBuilderVirtualSystemCreationData.mof")
-
// Associations
-#pragma include ("XEN_VMBuilderHostedService.mof")
-//#pragma include ("XEN_VMBuilderOwningJobElement.mof")
-//#pragma include ("XEN_VMBuilderProcessOfJob.mof")
+#pragma include ("XEN_HostedVMBuilderService.mof")
+#pragma include ("XEN_VMBuilderOwningJobElement.mof")
+#pragma include ("XEN_VMBuilderProcessOfJob.mof")
Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof 2008-04-23 17:27:53 UTC (rev 581)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof 2008-04-23 17:45:50 UTC (rev 582)
@@ -5,7 +5,7 @@
"XEN_VMBuilderJob represents a vm installation(build) job")]
class XEN_VMBuilderJob : CIM_Job
{
- [Key, Overrride("Name"),
+ [Key, Override("Name"),
Description("XEN:VMBUILDER:<JobID>")]
string Name;
@@ -29,7 +29,7 @@
"50", // Memory
"60", "61", "62", "63", // Disk
"70", "71", "72", // Job Errors
- "80", "81", "82"} // Parameter Errors
+ "80", "81", "82"}, // Parameter Errors
Values {
// General Errors
"Success",
Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof 2008-04-23 17:27:53 UTC (rev 581)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof 2008-04-23 17:45:50 UTC (rev 582)
@@ -16,6 +16,6 @@
[Override ("PartComponent"), Description (
"The Process that results from the execution of the VM Builder "
"job")]
- XEN_UnixProcess REF PartComponent;
+ OMC_UnixProcess REF PartComponent;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-23 21:08:35
|
Revision: 584
http://omc.svn.sourceforge.net/omc/?rev=584&view=rev
Author: jcarey
Date: 2008-04-23 14:08:16 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Clean up
Removed Paths:
-------------
contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,20 +0,0 @@
-// ==================================================================
-// XEN_VMBuilderHostedService
-// ==================================================================
-[Association, Description (
- "XEN_VMBuilderHostedService is an association between the virtual "
- "machine incubation service (XEN_VMBuilderService) and the hosting "
- "computer system (CIM_ComputerSystem). The cardinality of "
- "this association is one-to-one. A System can only host one virtual "
- "machine builder.")]
-class XEN_VMBuilderHostedService : CIM_HostedService
-{
- [Override ("Antecedent"), Min (1), Max (1),
- Description ("The hosting System.")]
- CIM_ComputerSystem REF Antecedent;
-
- [Override ( "Dependent" ), Weak, Max(1),
- Description ("The VM Incubation Service hosted on the System.")]
- XEN_VMBuilderService REF Dependent;
-};
-
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,10 +0,0 @@
-// Import OMC VM Builder schema
-#pragma include ("XEN_VMBuilderService.mof")
-#pragma include ("XEN_VMBuilderJob.mof")
-#pragma include ("XEN_VMBuilderVirtualSystemCreationData.mof")
-
-// Associations
-#pragma include ("XEN_HostedVMBuilderService.mof")
-#pragma include ("XEN_VMBuilderOwningJobElement.mof")
-#pragma include ("XEN_VMBuilderProcessOfJob.mof")
-
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,178 +0,0 @@
-// ==================================================================
-// XEN_VMBuilderJob
-// ==================================================================
-[Abstract, Description (
- "XEN_VMBuilderJob represents a vm installation(build) job")]
-class XEN_VMBuilderJob : CIM_Job
-{
- [Key, Override("Name"),
- Description("XEN:VMBUILDER:<JobID>")]
- string Name;
-
- [Propagated ("CIM_ComputerSystem.Name"),
- Description("The name of the system that owns this job")]
- string HostComputerSystemName;
-
- [Description("Unique id of the vm-install job. "
- "Use this jobId to track through the Incubation process. ")]
- string JobID;
-
- [Description("Process ID (if applicable) of the vm installation job")]
- uint32 PID;
-
- [Description("Exit code of the incubation creation process"),
- ValueMap { "0", "1", // General Errors
- "10", "11", "12", "13", "14", // XEN Errors
- "20", "21", "22", "23", "24", "25", // VM Errors
- "30", "31", "32", "33", "34", "35", //Installation Source Errors
- "40", "41", // Architecture Errors
- "50", // Memory
- "60", "61", "62", "63", // Disk
- "70", "71", "72", // Job Errors
- "80", "81", "82"}, // Parameter Errors
- Values {
- // General Errors
- "Success",
- "Other runtime error",
- // XEN Errors
- "An error occurred in Xen.",
- "The hypervisor is not running.",
- "An incompatible version of the hypervisor is running.",
- "Unable to connect to the Xen daemon.",
- "Must be the 'root' user to manage Xen.",
- // VM Errors
- "Failed to start the VM.",
- "The VM has crashed.",
- "A VM by that name is already running.",
- "A VM configuration already exists with that name.",
- "A valid boot sector was not found. The installation may have failed.",
- "No kernel was found. The installation may have failed.",
- // Installation Source Errors
- "The installation source is using an unsupported protocol.",
- "An error occurred while reading from the installation source.",
- "The installation source was not found.",
- "The installation source is unusable.",
- "No installation source was defined.",
- "A CD-ROM or DVD must be specified from which to boot.",
- // Architecture Errors
- "The operating system is incompatible with the processor architecture of this machine.",
- "The processor(s) in this machine do not support full virtualization.",
- // Resources: Memory
- "Not enough memory.",
- // Resources: Disk
- "The disk does not exist.",
- "The disk is read-only.",
- "Permission was denied while attempting to access the disk.",
- "Two of the virtual disks have conflicting virtual names or physical devices.",
- // Job Errors
- "The job was canceled.",
- "The job was not found.",
- "The job is in the wrong state to perform that action.",
- // Parameter Errors
- "A parameter is invalid or missing.",
- "The operating system does not support paravirtualization.",
- "The operating system does not support automated installations."}]
- uint32 ExitCode;
-
- [Override("JobStatus"),
- Values {"SETTINGS",
- "PREP_INSTALL",
- "INSTALL",
- "POST_INSTALL",
- "RUNTIME_CONF",
- "RUNTIME",
- "FINISHED",
- "FAILED",
- "CANCELED",
- "UNKNOWN",
- "PRE_DISPATCH",
- "DISPATCHED" }]
- string JobStatus;
-
- [Description("URL to VNC port to contact the vm. NOTE: This does not "
- "guarantee that the URL is active. It is the last known VNC URL.")]
- string VncURL;
-
- [Description("UUID of resulting VM")]
- string VM_UUID;
-
- [Description("File name that the vm installation will post status "
- "changes to")]
- string StatusFileName;
-
- [Description("Location (host:/path) of the installation log for the job")]
- string InstallLogFileLocation;
-
- // The parameters with which the installation was created
-
- [Description("The user friendly name given to the VM")]
- string VMName;
-
- // make this an embedded instance?
- [Description("The object path to the static instance of "
- "XEN_VMBuilderVirtualSystemCreationData")]
- string NewSystemCreationData;
-
- [Description("Type of guest (vm) OS. This defines many defaults and "
- " provides bootstrap capability. "),
- ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21"},
- Values { "other", "suse", "sles8", "sles9", "sles10", "sled10",
- "oes2l", "oes2nw", "netware", "redhat", "rhel3", "rhel4",
- "rhel5", "solaris9", "solaris10", "windows", "windowsx64",
- "windowsnt", "windowsxp", "windowsxpx64", "windowsvista",
- "windowsvistax64" }]
- uint32 OSType;
-
- [Description("A string containing the URL where the install source "
- "can be obtained. ie:"
- " nfs:host:/path "
- " http://host/path "
- " ftp://host/path "
- " To install from virtual disk defined in the 'NewSystemCreationData' "
- " instance: "
- " dev:/xvda (example syntax - provide appropriate device name")]
- string SourceURL;
-
- [Description("Contents of response file to automate the "
- "installation of the OS. The format of the file depends on the OS. "
- "Not all OS types support automated installations.")]
- string ResponseFile;
-};
-
-
-
-// ==================================================================
-// XEN_VMBuilderLocalJob
-// ==================================================================
-[Description (
- "XEN_VMBuilderLocalJob is an instance of a vm creation that is "
- "occurring on the local box.")]
-// Provider("cmpi::omc_vmbuilderlocaljob")]
-class XEN_VMBuilderLocalJob : XEN_VMBuilderJob
-{
-
-};
-
-
-
-// ==================================================================
-// XEN_VMBuilderDispatchJob
-// ==================================================================
-[Description (
- "XEN_VMBuilderDispatchJob is an instance of a vm creation that has "
- "been dispatched to some server in a network of incubation servers. It "
- "indicates that the IncubationServer on the local box dispatched the job, "
- "and will have ongoing status information about that job.")]
-class XEN_VMBuilderDispatchJob : XEN_VMBuilderJob
-{
- // ref to actual BuilderLocalJob on the remote box.
- [Description("A String representation of the object path to the LocalJob "
- "instance on the box where the actual install is occurring. ")]
- string ActualIncubationJobPath;
- [Propagated ("XEN_UnitaryComputerSystem.Name"),
- Description("The name of the system where the actual incubation "
- "took place")]
- string IncubationSystemHostName;
-
-};
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,17 +0,0 @@
-// ==================================================================
-// XEN_VMBuilderOwningJobElement
-// ==================================================================
-[Association, Description (
- "XEN_VMBuilderOwningJobElement describes the association between "
- "the virtual machine builder service and a running builder job")]
-class XEN_VMBuilderOwningJobElement : CIM_OwningJobElement
-{
- [Override("OwningElement"), Description(
- "The builder service that owns the job")]
- XEN_VMBuilderService REF OwningElement;
-
- [Override("OwnedElement"), Description(
- "The incubation job")]
- XEN_VMBuilderJob REF OwnedElement;
-};
-
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,21 +0,0 @@
-// ==================================================================
-// XEN_VMBuilderProcessOfJob
-// ==================================================================
-[Association, Aggregation, Composition, Description (
- "XEN_VMBuilderProcessOfJob describes the relationship between a VM "
- "Builder Job that was submitted by the CIM Provider and a running "
- "process on the system.")]
-class XEN_VMBuilderProcessOfJob : CIM_ProcessOfJob
-{
- [Aggregate, Override ("GroupComponent"), Description (
- "Execution of a VM Builder Job results in the createion of a "
- "process running on the local machine. The Job aggregates the "
- "process(es) that created when it is executed")]
- XEN_VMBuilderJob REF GroupComponent;
-
- [Override ("PartComponent"), Description (
- "The Process that results from the execution of the VM Builder "
- "job")]
- OMC_UnixProcess REF PartComponent;
-};
-
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,131 +0,0 @@
-// ==================================================================
-// XEN_VMBuilderService
-// ==================================================================
-[Description (
- "XEN_VMBuilderService represents the virtual machine incubator "
- "functionality/service")]
-// Provider("cmpi::omc_vmincubatorservice")]
-class XEN_VMBuilderService : CIM_Service
-{
- [Description("Initiate the creation of a VM. Result will be the object path "
- "to the instance of XEN_VMBuilderJob representing the "
- "vm creation job, via the OUT parameter. Return code = 0 if success "
- "or error code. All ongoing status about the vm creation will be "
- "reflected in the properties of that instance.")]
- uint32 CreateVM(
- [IN, Description("This flag applies to distributed incubation "
- "environments. It indicates whether this request should be forced "
- "to occur on the local box or can be dispatched. If FALSE and in "
- "a distributed environment, the dispatcher should set to true before "
- "dispatching, so that the system the the request is dispatched to "
- "sees it as ForceLocal=TRUE")]
- boolean ForceLocal,
-
- [IN, Description("The name that the VM will be given.")]
- string VMName,
-
- [IN, Description("The object path to the static instance of "
- "XEN_VMBuilderVirtualSystemCreationData "
- "NOTE: Either NewSystemCreationData or NewSystemCreationDataInstance "
- " must be provided")]
- XEN_VMBuilderVirtualSystemCreationData REF NewSystemCreationData,
-
- [IN, Description("The embedded instance (MOF, not CIM-XML) of the static instance of "
- "XEN_VMBuilderVirtualSystemCreationData. "
- "NOTE: Either NewSystemCreationData or NewSystemCreationDataInstance "
- " must be provided"),
- EmbeddedInstance ( "XEN_VMBuilderVirtualSystemCreationData" )]
- string NewSystemCreationDataInstance,
-
- [IN, Description("Type of guest (vm) OS. This defines many defaults and "
- " provides bootstrap capability. "),
- ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21"},
- Values { "other", "suse", "sles8", "sles9", "sles10", "sled10",
- "oes2l", "oes2nw", "netware", "redhat", "rhel3", "rhel4",
- "rhel5", "solaris9", "solaris10", "windows", "windowsx64",
- "windowsnt", "windowsxp", "windowsxpx64", "windowsvista",
- "windowsvistax64" }]
- uint32 OSType,
-
- [IN, Description("A string containing the URL where the install source "
- "can be obtained. ie:"
- " nfs:host:/path "
- " http://host/path "
- " ftp://host/path "
- " To install from virtual disk defined in the 'NewSystemCreationData' "
- " instance: "
- " dev:/xvda (example syntax - provide appropriate device name")]
- string SourceURL,
-
- [IN, Description("Either path to, or the contents of, response file to automate "
- "the installation of the OS. The format of the file depends on the OS. "
- "Not all OS types support automated installations. "
- "If path to file, must start with FILE:, then fully-qualified path "
- "relative to the incubation machine. If contents, then full contents "
- "of the file. Any text that doesn't start with FILE: will be considered "
- "contents.")]
- string ResponseFile,
-
- [IN, Description("Additional arguments to pass to the paravirtualized OS. "
- "(No need to provide OS-specific arguments to bootstrap the "
- "installation")]
- string ExtraInstallArgs,
-
- [IN, Description("The dispatched job ID, ie ZosJobID. Only applicable "
- "if this createVM call is made from the dispatcher")]
- string ZosJobID,
-
- [IN ( false ), OUT, Description ("REF to the new "
- "XEN_VMBuilderJob instance. If forceLocal=True, returns a "
- "XEN_VMBuilderLocalJob instance. If false, returns a "
- "XEN_VMBuilderDispatchJob instance")]
- XEN_VMBuilderJob REF VMBuilderJob);
-
-
- [Description("Cancel a vm installation job that was previously initiated.")]
- boolean CancelBuildJob(
- [IN, Description("The jobID of the XEN_VMBuilderJob to cancel. "
- "Cancel will remove all remnants of the incubation job, leaving "
- "only an entry in the XEN_VMBuilderJobRecordLog.")]
- string JobID,
- [IN, Description("This flag applies to distributed incubation "
- "environments. It indicates whether this request should be forced "
- "to occur on the local box or can be dispatched. If FALSE, "
- "the ZOS job ID should be given for the JobID parameter. "
- "If TRUE, the vm-install Local job ID should be given for "
- "the JobID parameter.")]
- boolean ForceLocal);
-
- [Description("Delete a vm installation job that was previously initiated. "
- "Delete will remove all remnants of the incubation job, leaving "
- "only an entry in the XEN_VMBuilderJobRecordLog.")]
- boolean DeleteBuildJob(
- [IN, Description("The jobID of the XEN_VMBuilderJob to delete. ")]
- string JobID,
- [IN, Description("This flag applies to distributed incubation "
- "environments. It indicates whether this request should be forced "
- "to occur on the local box or can be dispatched. If FALSE, "
- "the ZOS job ID should be given for the JobID parameter. "
- "If TRUE, the vm-install Local job ID should be given for "
- "the JobID parameter.")]
- boolean ForceLocal);
-
- [Description("Cancel a vm installation job that was previously initiated. "
- "Detach will remove knowledge of the incubation job / incubated vm, "
- "but it will leave the incubated vm on the system. It will also leave "
- "an entry in XEN_VMBuilderJobRecordLog.")]
- boolean DetachBuildJob(
- [IN, Description("The jobID of the XEN_VMBuilderJob to detach. ")]
- string JobID);
-
-
- [Description("Retrieve the location (host:path) of the installation log "
- "of the specified jobID.")]
- string GetJobLogLocation(
- [IN, Description("The jobID of the XEN_VMBuilderJob.")]
- string JobID);
-
- [Description("VM builder service version")]
- string BuilderVersion;
-};
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,92 +0,0 @@
-// ==================================================================
-// XEN_VMBuilderVirtualSystemCreationData
-// ==================================================================
-[Description (
- "XEN_VMBuilderVirtualSystemCreationData defines the incubator aspects of a "
- "virtual system through a set of virtualization specific properties, for "
- "vm creation. "
- "It is intended that incubator clients to create a static instance of this "
- "class filling in appropriate properties as a means of passing all the vssd "
- "specific parameters for creating a vm, in one parameter, to the CreateVM "
- "method on XEN_VMBuilderService.")]
-class XEN_VMBuilderVirtualSystemCreationData : CIM_VirtualSystemSettingData
-{
- [Description(
- "UUID contains the universal unique identifier for the virtual machine. "
- "If none is given, a random UUID will be generated.")]
- string UUID;
-
- [Description("type of virtualization. Values: "
- " Unknown: undefined behavior - maybe try to determine best? "
- " Para: Para Virtualization: OS Must support para virtualization. "
- " Full: Full Virtualization: Hardware must support full virtualization."),
- ValueMap { "0", "1", "2"},
- Values { "Unknown", "Para", "Full" }]
- uint32 VirtType;
-
- [Description("Number of virtual CPUs for the virtual machine")]
- uint8 NumVCPUs;
-
- [Description("Megabytes of RAM to initially allocate to the VM")]
- uint32 Memory;
-
- [Description("Max Megabytes of RAM to allocate to the VM")]
- uint32 MaxMemory;
-
- [Description("Disk definitions for the virtual machine."
- " Format: 'PDEV,VDEV[,TYPE[,MODE[,MB]]]', where TYPE='disk' or 'cdrom' "
- " ie /x/y/$$VMNAME$$/disk0,xvda,disk,w,10 "
- " TAGS: if $$VMNAME$$ is found in the disk string, it will be "
- " replaced by the vmName specified by parameter to "
- " XEN_VMBuilderService::CreateVM ")]
- string Disks[];
-
- [Description("Network Interface definitions for the virtual machine."
- " This is a multi-value property: each array entry represents a "
- " separate value. "
- " Format for each entry: "
- " A comma-separated list of key/value pairs. Valid keys: "
- " mac=AA.BB.CC.DD.EE.FF randomly generated if not specified"
- " bridge=BRIDGE "
- " model=MODEL only applicable for full-virt. can be one of: "
- " 'pcnet' AMD PCnet 32 "
- " 'ne2k_isa' NE2000 on ISA bus "
- " 'ne2k_pci' NE2000 on PCI bus "
- " 'rtl8139' Realtec 8139 "
- " To define a NIC with all defaults, specify only 'default' ")]
- string Nics[];
-
- [Description("type of virtualized graphics hardware:"
- " 'unknown': default to none "
- " 'cirrus' : cirrus logic gc5446 pci vga: for full virt only. "
- " 'none' : no graphics support; use serial console or network access. "
- " 'para' : paravirtualized framebuffer; requires driver in os. "
- " 'vesa' : standard vga with vesa extensions: for full virt only."),
- ValueMap { "0", "1", "2", "3", "4"},
- Values { "Unknown", "Cirrus", "None", "Para", "Vesa" }]
- uint32 GraphicsType;
-
- [Description("type of graphics viewer. Values: "
- " Unknown: undefined behavior - default to VNC? "
- " SDL: use SDL for graphics viewer - best when the vm will usually "
- " be viewed locally. "
- " VNC: use VNC for graphics viewer."),
- ValueMap { "0", "1", "2"},
- Values { "Unknown", "SDL", "VNC" }]
- uint32 GraphicsViewerType;
-
- [Description("CPU Architecture for the virtual machine. For incubation, also "
- " serves as the constraint for where to dispatch the incubation job." ),
- Values { "Unknown", "x86", "x86_64", "ia64", "ppc" }]
- string CPUArchitecture;
-
- [Description("Port to use for VNC server")]
- uint32 VNCPort;
-
- [Description("Field for users of this object to store additional data related "
- "to this object. This is not used by the providers. It is user-defined "
- "and user consumed. It is defined as a string array to allow for "
- "key:value pairs within each element of the array, if the user so desires.")]
- String ExtraConfigInfo[];
-};
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-23 21:14:30
|
Revision: 585
http://omc.svn.sourceforge.net/omc/?rev=585&view=rev
Author: jcarey
Date: 2008-04-23 14:14:35 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Refactor
Added Paths:
-----------
contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
contrib/xen-vm-builder/trunk/mof/XEN_SettingsDefineBuild.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof
Added: contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof 2008-04-23 21:14:35 UTC (rev 585)
@@ -0,0 +1,20 @@
+// ==================================================================
+// XEN_VMBuilderHostedService
+// ==================================================================
+[Association, Description (
+ "XEN_VMBuilderHostedService is an association between the virtual "
+ "machine incubation service (XEN_VMBuilderService) and the hosting "
+ "computer system (CIM_ComputerSystem). The cardinality of "
+ "this association is one-to-one. A System can only host one virtual "
+ "machine builder.")]
+class XEN_VMBuilderHostedService : CIM_HostedService
+{
+ [Override ("Antecedent"), Min (1), Max (1),
+ Description ("The hosting System.")]
+ CIM_ComputerSystem REF Antecedent;
+
+ [Override ( "Dependent" ), Weak, Max(1),
+ Description ("The VM Builder Service hosted on the System.")]
+ XEN_VMBuilderService REF Dependent;
+};
+
Added: contrib/xen-vm-builder/trunk/mof/XEN_SettingsDefineBuild.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_SettingsDefineBuild.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_SettingsDefineBuild.mof 2008-04-23 21:14:35 UTC (rev 585)
@@ -0,0 +1,18 @@
+// ==================================================================
+// XEN_SettingsDefineBuild
+// ==================================================================
+[Association, Description (
+ "XEN_SettingsDefineBuild is used to associate a XEN_VMBuilderJob "
+ "with the all the settings provided to build the virtual machine "
+ "(XEN_VMBuilderVirtualSystemCreationData)")]
+class XEN_SettingsDefineBuild : CIM_SettingsDefineState
+{
+ [Override("ManagedElement"), Key,
+ Description("The builder job")]
+ XEN_VMBuilderJob REF ManagedElement;
+
+ [Override("SettingData"), Key,
+ Description ("The creation data used for the build")]
+ XEN_VMBuilderVirtualSystemCreationData REF SettingData;
+};
+
Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-23 21:14:35 UTC (rev 585)
@@ -0,0 +1,16 @@
+// Import OMC VM Builder schema
+#pragma include ("XEN_VMBuilderService.mof")
+#pragma include ("XEN_VMBuilderJob.mof")
+#pragma include ("XEN_VMBuilderVirtualSystemCreationData.mof")
+
+// Associations
+#pragma include ("XEN_VMBuilderOwningJobElement.mof")
+#pragma include ("XEN_VMBuilderProcessOfJob.mof")
+#pragma include ("XEN_HostedVMBuilderService.mof")
+#pragma include ("XEN_SettingsDefineBuild.mof")
+
+
+
+
+
+
Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof 2008-04-23 21:14:35 UTC (rev 585)
@@ -0,0 +1,153 @@
+// ==================================================================
+// XEN_VMBuilderJob
+// ==================================================================
+[Description(
+ "XEN_VMBuilderJob represents a vm installation(build) job. "
+ "These jobs are the result of running the vm-install command "
+ "line utility")]
+class XEN_VMBuilderJob : CIM_Job
+{
+ [Key, Override("Name"),
+ Description("XEN:VMBUILDER:<JobID>")]
+ string Name;
+
+ [Propagated ("CIM_ComputerSystem.Name"),
+ Description("The name of the system that owns this job")]
+ string HostComputerSystemName;
+
+ [Description("Unique id of the vm-install job. "
+ "Use this jobId to track through the Incubation process. ")]
+ string JobID;
+
+ [Description("Process ID (if applicable) of the vm installation job")]
+ uint32 PID;
+
+ [Description("Exit code of the incubation creation process"),
+ ValueMap { "0", "1", // General Errors
+ "10", "11", "12", "13", "14", // XEN Errors
+ "20", "21", "22", "23", "24", "25", // VM Errors
+ "30", "31", "32", "33", "34", "35", //Installation Source Errors
+ "40", "41", // Architecture Errors
+ "50", // Memory
+ "60", "61", "62", "63", // Disk
+ "70", "71", "72", // Job Errors
+ "80", "81", "82"}, // Parameter Errors
+ Values {
+ // General Errors
+ "Success",
+ "Other runtime error",
+ // XEN Errors
+ "An error occurred in Xen.",
+ "The hypervisor is not running.",
+ "An incompatible version of the hypervisor is running.",
+ "Unable to connect to the Xen daemon.",
+ "Must be the 'root' user to manage Xen.",
+ // VM Errors
+ "Failed to start the VM.",
+ "The VM has crashed.",
+ "A VM by that name is already running.",
+ "A VM configuration already exists with that name.",
+ "A valid boot sector was not found. The installation may have failed.",
+ "No kernel was found. The installation may have failed.",
+ // Installation Source Errors
+ "The installation source is using an unsupported protocol.",
+ "An error occurred while reading from the installation source.",
+ "The installation source was not found.",
+ "The installation source is unusable.",
+ "No installation source was defined.",
+ "A CD-ROM or DVD must be specified from which to boot.",
+ // Architecture Errors
+ "The operating system is incompatible with the processor architecture of this machine.",
+ "The processor(s) in this machine do not support full virtualization.",
+ // Resources: Memory
+ "Not enough memory.",
+ // Resources: Disk
+ "The disk does not exist.",
+ "The disk is read-only.",
+ "Permission was denied while attempting to access the disk.",
+ "Two of the virtual disks have conflicting virtual names or physical devices.",
+ // Job Errors
+ "The job was canceled.",
+ "The job was not found.",
+ "The job is in the wrong state to perform that action.",
+ // Parameter Errors
+ "A parameter is invalid or missing.",
+ "The operating system does not support paravirtualization.",
+ "The operating system does not support automated installations."}]
+ uint32 ExitCode;
+
+ [Override("JobStatus"),
+ Values {"SETTINGS",
+ "PREP_INSTALL",
+ "INSTALL",
+ "POST_INSTALL",
+ "RUNTIME_CONF",
+ "RUNTIME",
+ "FINISHED",
+ "FAILED",
+ "CANCELED",
+ "UNKNOWN"}]
+ string JobStatus;
+
+ [Description("URL to VNC port to contact the vm. NOTE: This does not "
+ "guarantee that the URL is active. It is the last known VNC URL.")]
+ string VncURL;
+
+ [Description("UUID of resulting VM")]
+ string VM_UUID;
+
+ [Description("File name that the vm installation will post status "
+ "changes to")]
+ string StatusFileName;
+
+ [Description("Location (host:/path) of the installation log for the job")]
+ string InstallLogFileLocation;
+
+ // The parameters with which the installation was created
+
+ [Description("The user friendly name given to the VM")]
+ string VMName;
+
+ // DeleteInstance:
+ // Deletes the job. The job must be in one of the FINISHED, FAILED, or
+ // CANCELED states. The VM's configuration is deleted, as are any disks
+ // that were created during the job.
+
+ [Description("Detaches the created VM from this job. This job must be in the "
+ "FINISHED state. This job will be deleted, but the VM's configuration "
+ "and its disks are left intact."),
+ ValueMap {
+ "0",
+ "1",
+ "2",
+ "4",
+ "4097" },
+ Values {
+ "Completed with No Error",
+ "Not Supported",
+ "Unknown/Unspecified Error",
+ "Failed",
+ "Invalid State Transition" }]
+ uint32 Detach();
+
+ [Description (
+ "Cancels the specified job. If the VM is still running, it is "
+ "stopped. This command may return before the VM is completely "
+ "stopped or the vm-install process has completely exited. The "
+ "job is not implicitly deleted, so that the cancelation progress "
+ "may be observed."),
+ ValueMap {
+ "0",
+ "1",
+ "2",
+ "4",
+ "4097"},
+ Values {
+ "Completed with No Error",
+ "Not Supported",
+ "Unknown/Unspecified Error",
+ "Failed",
+ "Invalid State Transition"}]
+ uint32 Cancel();
+};
+
Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof 2008-04-23 21:14:35 UTC (rev 585)
@@ -0,0 +1,17 @@
+// ==================================================================
+// XEN_VMBuilderOwningJobElement
+// ==================================================================
+[Association, Description (
+ "XEN_VMBuilderOwningJobElement describes the association between "
+ "the virtual machine builder service and a running builder job")]
+class XEN_VMBuilderOwningJobElement : CIM_OwningJobElement
+{
+ [Override("OwningElement"), Description(
+ "The builder service that owns the job")]
+ XEN_VMBuilderService REF OwningElement;
+
+ [Override("OwnedElement"), Description(
+ "The incubation job")]
+ XEN_VMBuilderJob REF OwnedElement;
+};
+
Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof 2008-04-23 21:14:35 UTC (rev 585)
@@ -0,0 +1,21 @@
+// ==================================================================
+// XEN_VMBuilderProcessOfJob
+// ==================================================================
+[Association, Aggregation, Composition, Description (
+ "XEN_VMBuilderProcessOfJob describes the relationship between a VM "
+ "Builder Job that was submitted by the CIM Provider and a running "
+ "process on the system.")]
+class XEN_VMBuilderProcessOfJob : CIM_ProcessOfJob
+{
+ [Aggregate, Override ("GroupComponent"), Description (
+ "Execution of a VM Builder Job results in the createion of a "
+ "process running on the local machine. The Job aggregates the "
+ "process(es) that created when it is executed")]
+ XEN_VMBuilderJob REF GroupComponent;
+
+ [Override ("PartComponent"), Description (
+ "The Process that results from the execution of the VM Builder "
+ "job")]
+ OMC_UnixProcess REF PartComponent;
+};
+
Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof 2008-04-23 21:14:35 UTC (rev 585)
@@ -0,0 +1,29 @@
+// ==================================================================
+// XEN_VMBuilderService
+// ==================================================================
+[Description (
+ "XEN_VMBuilderService represents the virtual machine incubator "
+ "functionality/service")]
+class XEN_VMBuilderService : CIM_Service
+{
+ [Description("Initiate the creation of a VM. Result will be the object path "
+ "to the instance of XEN_VMBuilderJob representing the "
+ "vm creation job, via the OUT parameter. Return code = 0 if success "
+ "or error code. All ongoing status about the vm creation will be "
+ "reflected in the properties of that instance.")]
+ uint32 CreateVM(
+ [IN, Description("The name that the VM will be given.")]
+ string VMName,
+
+ [IN, Description("The object path to the instance of "
+ "XEN_VMBuilderVirtualSystemCreationData that will be used "
+ "for the build")]
+ XEN_VMBuilderVirtualSystemCreationData REF NewSystemCreationData,
+
+ [IN(false), OUT, Description ("REF to the new "
+ "XEN_VMBuilderJob instance.")]
+ XEN_VMBuilderJob REF VMBuilderJob);
+
+ [Description("VM builder service version")]
+ string BuilderVersion;
+};
Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof 2008-04-23 21:14:35 UTC (rev 585)
@@ -0,0 +1,120 @@
+// ==================================================================
+// XEN_VMBuilderVirtualSystemCreationData
+// ==================================================================
+[Description (
+ "XEN_VMBuilderVirtualSystemCreationData defines the incubator aspects of a "
+ "virtual system through a set of virtualization specific properties, for "
+ "vm creation. "
+ "It is intended that incubator clients to create a static instance of this "
+ "class filling in appropriate properties as a means of passing all the vssd "
+ "specific parameters for creating a vm, in one parameter, to the CreateVM "
+ "method on XEN_VMBuilderService.")]
+class XEN_VMBuilderVirtualSystemCreationData : CIM_VirtualSystemSettingData
+{
+ [Description(
+ "UUID contains the universal unique identifier for the virtual machine. "
+ "If none is given, a random UUID will be generated.")]
+ string UUID;
+
+ [Description("type of virtualization. Values: "
+ " Unknown: undefined behavior - maybe try to determine best? "
+ " Para: Para Virtualization: OS Must support para virtualization. "
+ " Full: Full Virtualization: Hardware must support full virtualization."),
+ ValueMap { "0", "1", "2"},
+ Values { "Unknown", "Para", "Full" }]
+ uint32 VirtType;
+
+ [Description("Number of virtual CPUs for the virtual machine")]
+ uint8 NumVCPUs;
+
+ [Description("Megabytes of RAM to initially allocate to the VM")]
+ uint32 Memory;
+
+ [Description("Max Megabytes of RAM to allocate to the VM")]
+ uint32 MaxMemory;
+
+ [Description("Disk definitions for the virtual machine."
+ " Format: 'PDEV,VDEV[,TYPE[,MODE[,MB]]]', where TYPE='disk' or 'cdrom' "
+ " ie /x/y/$$VMNAME$$/disk0,xvda,disk,w,10 "
+ " TAGS: if $$VMNAME$$ is found in the disk string, it will be "
+ " replaced by the vmName specified by parameter to "
+ " XEN_VMBuilderService::CreateVM ")]
+ string Disks[];
+
+ [Description("Network Interface definitions for the virtual machine."
+ " This is a multi-value property: each array entry represents a "
+ " separate value. "
+ " Format for each entry: "
+ " A comma-separated list of key/value pairs. Valid keys: "
+ " mac=AA.BB.CC.DD.EE.FF randomly generated if not specified"
+ " bridge=BRIDGE "
+ " model=MODEL only applicable for full-virt. can be one of: "
+ " 'pcnet' AMD PCnet 32 "
+ " 'ne2k_isa' NE2000 on ISA bus "
+ " 'ne2k_pci' NE2000 on PCI bus "
+ " 'rtl8139' Realtec 8139 "
+ " To define a NIC with all defaults, specify only 'default' ")]
+ string Nics[];
+
+ [Description("type of virtualized graphics hardware:"
+ " 'unknown': default to none "
+ " 'cirrus' : cirrus logic gc5446 pci vga: for full virt only. "
+ " 'none' : no graphics support; use serial console or network access. "
+ " 'para' : paravirtualized framebuffer; requires driver in os. "
+ " 'vesa' : standard vga with vesa extensions: for full virt only."),
+ ValueMap { "0", "1", "2", "3", "4"},
+ Values { "Unknown", "Cirrus", "None", "Para", "Vesa" }]
+ uint32 GraphicsType;
+
+ [Description("type of graphics viewer. Values: "
+ " Unknown: undefined behavior - default to VNC? "
+ " SDL: use SDL for graphics viewer - best when the vm will usually "
+ " be viewed locally. "
+ " VNC: use VNC for graphics viewer."),
+ ValueMap { "0", "1", "2"},
+ Values { "Unknown", "SDL", "VNC" }]
+ uint32 GraphicsViewerType;
+
+ [Description("CPU Architecture for the virtual machine. For incubation, also "
+ " serves as the constraint for where to dispatch the incubation job." ),
+ Values { "Unknown", "x86", "x86_64", "ia64", "ppc" }]
+ string CPUArchitecture;
+
+ [Description("Port to use for VNC server")]
+ uint32 VNCPort;
+
+ [Description("Field for users of this object to store additional data related "
+ "to this object. This is not used by the providers. It is user-defined "
+ "and user consumed. It is defined as a string array to allow for "
+ "key:value pairs within each element of the array, if the user so desires.")]
+ String ExtraConfigInfo[];
+
+ [Description("Extra arguments used for the VM Install. May not need.")]
+ string ExtraInstallArgs;
+
+ [Description("A string containing the URL where the install source "
+ "can be obtained. ie:"
+ " nfs:host:/path "
+ " http://host/path "
+ " ftp://host/path "
+ " To install from virtual disk defined in the Disks property:"
+ " dev:/xvda (example syntax - provide appropriate device name")]
+ string SourceURL;
+
+ [Description("Contents of response file to automate the "
+ "installation of the OS. The format of the file depends on the OS. "
+ "Not all OS types support automated installations.")]
+ string ResponseFile;
+
+ [Description("Type of guest (vm) OS. This defines many defaults and "
+ " provides bootstrap capability. "),
+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
+ "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21"},
+ Values { "other", "suse", "sles8", "sles9", "sles10", "sled10",
+ "oes2l", "oes2nw", "netware", "redhat", "rhel3", "rhel4",
+ "rhel5", "solaris9", "solaris10", "windows", "windowsx64",
+ "windowsnt", "windowsxp", "windowsxpx64", "windowsvista",
+ "windowsvistax64" }]
+ uint32 OSType;
+};
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-24 20:24:44
|
Revision: 591
http://omc.svn.sourceforge.net/omc/?rev=591&view=rev
Author: jcarey
Date: 2008-04-24 13:24:45 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Renamed file
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/Makefile.am
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
Added Paths:
-----------
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderHostedService.mof
Removed Paths:
-------------
contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
Modified: contrib/xen-vm-builder/trunk/mof/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-04-24 20:13:38 UTC (rev 590)
+++ contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-04-24 20:24:45 UTC (rev 591)
@@ -1,9 +1,9 @@
EXTRA_DIST = \
- XEN_HostedVMBuilderService.mof \
XEN_SettingsDefineBuild.mof \
XEN_VMBuilder.mof \
XEN_VMBuilderJob.mof \
XEN_VMBuilderOwningJobElement.mof \
XEN_VMBuilderProcessOfJob.mof \
XEN_VMBuilderService.mof \
+ XEN_VMBuilderHostedService.mof \
XEN_VMBuilderVirtualSystemCreationData.mof
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof 2008-04-24 20:13:38 UTC (rev 590)
+++ contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof 2008-04-24 20:24:45 UTC (rev 591)
@@ -1,20 +0,0 @@
-// ==================================================================
-// XEN_VMBuilderHostedService
-// ==================================================================
-[Association, Description (
- "XEN_VMBuilderHostedService is an association between the virtual "
- "machine incubation service (XEN_VMBuilderService) and the hosting "
- "computer system (CIM_ComputerSystem). The cardinality of "
- "this association is one-to-one. A System can only host one virtual "
- "machine builder.")]
-class XEN_VMBuilderHostedService : CIM_HostedService
-{
- [Override ("Antecedent"), Min (1), Max (1),
- Description ("The hosting System.")]
- CIM_ComputerSystem REF Antecedent;
-
- [Override ( "Dependent" ), Weak, Max(1),
- Description ("The VM Builder Service hosted on the System.")]
- XEN_VMBuilderService REF Dependent;
-};
-
Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-24 20:13:38 UTC (rev 590)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-24 20:24:45 UTC (rev 591)
@@ -6,7 +6,7 @@
// Associations
#pragma include ("XEN_VMBuilderOwningJobElement.mof")
#pragma include ("XEN_VMBuilderProcessOfJob.mof")
-#pragma include ("XEN_HostedVMBuilderService.mof")
+#pragma include ("XEN_VMBuilderHostedService.mof")
#pragma include ("XEN_SettingsDefineBuild.mof")
Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderHostedService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderHostedService.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderHostedService.mof 2008-04-24 20:24:45 UTC (rev 591)
@@ -0,0 +1,20 @@
+// ==================================================================
+// XEN_VMBuilderHostedService
+// ==================================================================
+[Association, Description (
+ "XEN_VMBuilderHostedService is an association between the virtual "
+ "machine incubation service (XEN_VMBuilderService) and the hosting "
+ "computer system (CIM_ComputerSystem). The cardinality of "
+ "this association is one-to-one. A System can only host one virtual "
+ "machine builder.")]
+class XEN_VMBuilderHostedService : CIM_HostedService
+{
+ [Override ("Antecedent"), Min (1), Max (1),
+ Description ("The hosting System.")]
+ CIM_ComputerSystem REF Antecedent;
+
+ [Override ( "Dependent" ), Weak, Max(1),
+ Description ("The VM Builder Service hosted on the System.")]
+ XEN_VMBuilderService REF Dependent;
+};
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-05-23 15:11:30
|
Revision: 616
http://omc.svn.sourceforge.net/omc/?rev=616&view=rev
Author: jcarey
Date: 2008-05-23 08:11:36 -0700 (Fri, 23 May 2008)
Log Message:
-----------
Changed capability IDs
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
contrib/xen-vm-builder/trunk/mof/builder-job-peg.reg
contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg
Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof 2008-05-22 16:19:58 UTC (rev 615)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof 2008-05-23 15:11:36 UTC (rev 616)
@@ -140,7 +140,7 @@
"0",
"1",
"2",
- "4",
+ "4",
"4097"},
Values {
"Completed with No Error",
Modified: contrib/xen-vm-builder/trunk/mof/builder-job-peg.reg
===================================================================
--- contrib/xen-vm-builder/trunk/mof/builder-job-peg.reg 2008-05-22 16:19:58 UTC (rev 615)
+++ contrib/xen-vm-builder/trunk/mof/builder-job-peg.reg 2008-05-23 15:11:36 UTC (rev 616)
@@ -18,7 +18,7 @@
{
ProviderModuleName = "OMC_XENVMBuilderJob_Module";
ProviderName = "omc_xenvmbuilderjob";
- CapabilityID = "1";
+ CapabilityID = "OMC_XENVMBuilderJob0001";
ClassName = "XEN_VMBuilderJob";
Namespaces = {"root/cimv2"};
ProviderType = { 2, 5 }; // Instance, Method
Modified: contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg
===================================================================
--- contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg 2008-05-22 16:19:58 UTC (rev 615)
+++ contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg 2008-05-23 15:11:36 UTC (rev 616)
@@ -18,7 +18,7 @@
{
ProviderModuleName = "OMC_XENVMBuilder_Module";
ProviderName = "omc_xenvmbuilder";
- CapabilityID = "1";
+ CapabilityID = "OMC_XENVMBuilder_Module0001";
ClassName = "XEN_VMBuilderService";
Namespaces = {"root/cimv2"};
ProviderType = { 2, 5 }; // Instance, Method
@@ -30,7 +30,7 @@
{
ProviderModuleName = "OMC_XENVMBuilder_Module";
ProviderName = "omc_xenvmbuilder";
- CapabilityID = "2";
+ CapabilityID = "OMC_XENVMBuilder_Module0002";
ClassName = "XEN_VMBuilderHostedService";
Namespaces = {"root/cimv2"};
ProviderType = { 2, 3 }; // Instance, Associator
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-05-28 17:46:34
|
Revision: 623
http://omc.svn.sourceforge.net/omc/?rev=623&view=rev
Author: jcarey
Date: 2008-05-28 10:46:24 -0700 (Wed, 28 May 2008)
Log Message:
-----------
prov reg for settings-define-build and owning-job associations...
Added Paths:
-----------
contrib/xen-vm-builder/trunk/mof/owning-job-peg.reg
contrib/xen-vm-builder/trunk/mof/settings-define-build-peg.reg
Added: contrib/xen-vm-builder/trunk/mof/owning-job-peg.reg
===================================================================
--- contrib/xen-vm-builder/trunk/mof/owning-job-peg.reg (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/owning-job-peg.reg 2008-05-28 17:46:24 UTC (rev 623)
@@ -0,0 +1,28 @@
+instance of PG_ProviderModule
+{
+ Name = "OMC_XENVMBuilderOwningJob_Module";
+ Location = "omc_xenowningjob";
+ Vendor = "OMC";
+ Version = "1.0.0";
+ InterfaceType = "CMPI";
+ InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+ ProviderModuleName = "OMC_XENVMBuilderOwningJob_Module";
+ Name = "omc_xenowningjob";
+};
+
+instance of PG_ProviderCapabilities
+{
+ ProviderModuleName = "OMC_XENVMBuilderOwningJob_Module";
+ ProviderName = "omc_xenowningjob";
+ CapabilityID = "OMC_XENVMBuilderOwningJob_Module0001";
+ ClassName = "XEN_VMBuilderOwningJobElement";
+ Namespaces = {"root/cimv2"};
+ ProviderType = { 2, 3 }; // Instance, Associator
+ SupportedProperties = NULL; // All properties
+ SupportedMethods = NULL; // All methods
+};
+
Added: contrib/xen-vm-builder/trunk/mof/settings-define-build-peg.reg
===================================================================
--- contrib/xen-vm-builder/trunk/mof/settings-define-build-peg.reg (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/settings-define-build-peg.reg 2008-05-28 17:46:24 UTC (rev 623)
@@ -0,0 +1,28 @@
+instance of PG_ProviderModule
+{
+ Name = "OMC_XENVMBuilderSettingsDefineBuild_Module";
+ Location = "omc_xensettingsdefinebuild";
+ Vendor = "OMC";
+ Version = "1.0.0";
+ InterfaceType = "CMPI";
+ InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+ ProviderModuleName = "OMC_XENVMBuilderSettingsDefineBuild_Module";
+ Name = "omc_xensettingsdefinebuild";
+};
+
+instance of PG_ProviderCapabilities
+{
+ ProviderModuleName = "OMC_XENVMBuilderSettingsDefineBuild_Module";
+ ProviderName = "omc_xensettingsdefinebuild";
+ CapabilityID = "OMC_XENVMBuilderSettingsDefineBuild_Module0001";
+ ClassName = "XEN_SettingsDefineBuild";
+ Namespaces = {"root/cimv2"};
+ ProviderType = { 2, 3 }; // Instance, Associator
+ SupportedProperties = NULL; // All properties
+ SupportedMethods = NULL; // All methods
+};
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X