Rename VM and OVM occurences in the source-code folder

gilwoong-kang · Jun 11, 2018 · 5164e5c · 5164e5c
1 parent 2e1bbaf
commit 5164e5c
Show file tree

Hide file tree

Showing 69 changed files with 1,211 additions and 1,211 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -4112,62 +4112,6 @@
      }
     }
    },
-   "v1.VMReplicaSetSpec": {
-    "required": [
-     "selector",
-     "template"
-    ],
-    "properties": {
-     "paused": {
-      "description": "Indicates that the replica set is paused.\n+optional",
-      "type": "boolean"
-     },
-     "replicas": {
-      "description": "Number of desired pods. This is a pointer to distinguish between explicit\nzero and not specified. Defaults to 1.\n+optional",
-      "type": "integer",
-      "format": "int32"
-     },
-     "selector": {
-      "description": "Label selector for pods. Existing ReplicaSets whose pods are\nselected by this will be the ones affected by this deployment.",
-      "$ref": "#/definitions/v1.LabelSelector"
-     },
-     "template": {
-      "description": "Template describes the pods that will be created.",
-      "$ref": "#/definitions/v1.VMTemplateSpec"
-     }
-    }
-   },
-   "v1.VMReplicaSetStatus": {
-    "properties": {
-     "conditions": {
-      "type": "array",
-      "items": {
-       "$ref": "#/definitions/v1.VirtualMachineInstanceReplicaSetCondition"
-      }
-     },
-     "readyReplicas": {
-      "description": "The number of ready replicas for this replica set.\n+optional",
-      "type": "integer",
-      "format": "int32"
-     },
-     "replicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).\n+optional",
-      "type": "integer",
-      "format": "int32"
-     }
-    }
-   },
-   "v1.VMTemplateSpec": {
-    "properties": {
-     "metadata": {
-      "$ref": "#/definitions/v1.ObjectMeta"
-     },
-     "spec": {
-      "description": "VirtualMachineInstance Spec contains the VirtualMachineInstance specification.",
-      "$ref": "#/definitions/v1.VirtualMachineInstanceSpec"
-     }
-    }
-   },
    "v1.VirtualMachine": {
     "description": "VirtualMachine handles the VirtualMachines that are not running\nor are in a stopped state\nThe VirtualMachine contains the template to create the\nVirtualMachineInstance. It also mirrors the running state of the created\nVirtualMachineInstance in its status.",
     "properties": {
@@ -4360,7 +4304,7 @@
       "$ref": "#/definitions/v1.DomainSpec"
      },
      "selector": {
-      "description": "Selector is a label query over a set of VMs.\nRequired.",
+      "description": "Selector is a label query over a set of VMIs.\nRequired.",
       "$ref": "#/definitions/v1.LabelSelector"
      }
     }
@@ -4381,11 +4325,11 @@
      },
      "spec": {
       "description": "VirtualMachineInstance Spec contains the VirtualMachineInstance specification.",
-      "$ref": "#/definitions/v1.VMReplicaSetSpec"
+      "$ref": "#/definitions/v1.VirtualMachineInstanceReplicaSetSpec"
      },
      "status": {
       "description": "Status is the high level overview of how the VirtualMachineInstance is doing. It contains information available to controllers and users.",
-      "$ref": "#/definitions/v1.VMReplicaSetStatus"
+      "$ref": "#/definitions/v1.VirtualMachineInstanceReplicaSetStatus"
      }
     }
    },
@@ -4416,7 +4360,7 @@
     }
    },
    "v1.VirtualMachineInstanceReplicaSetList": {
-    "description": "VMList is a list of VMs",
+    "description": "VMIList is a list of VMIs",
     "required": [
      "items"
     ],
@@ -4440,6 +4384,51 @@
      }
     }
    },
+   "v1.VirtualMachineInstanceReplicaSetSpec": {
+    "required": [
+     "selector",
+     "template"
+    ],
+    "properties": {
+     "paused": {
+      "description": "Indicates that the replica set is paused.\n+optional",
+      "type": "boolean"
+     },
+     "replicas": {
+      "description": "Number of desired pods. This is a pointer to distinguish between explicit\nzero and not specified. Defaults to 1.\n+optional",
+      "type": "integer",
+      "format": "int32"
+     },
+     "selector": {
+      "description": "Label selector for pods. Existing ReplicaSets whose pods are\nselected by this will be the ones affected by this deployment.",
+      "$ref": "#/definitions/v1.LabelSelector"
+     },
+     "template": {
+      "description": "Template describes the pods that will be created.",
+      "$ref": "#/definitions/v1.VirtualMachineInstanceTemplateSpec"
+     }
+    }
+   },
+   "v1.VirtualMachineInstanceReplicaSetStatus": {
+    "properties": {
+     "conditions": {
+      "type": "array",
+      "items": {
+       "$ref": "#/definitions/v1.VirtualMachineInstanceReplicaSetCondition"
+      }
+     },
+     "readyReplicas": {
+      "description": "The number of ready replicas for this replica set.\n+optional",
+      "type": "integer",
+      "format": "int32"
+     },
+     "replicas": {
+      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).\n+optional",
+      "type": "integer",
+      "format": "int32"
+     }
+    }
+   },
    "v1.VirtualMachineInstanceSpec": {
     "description": "VirtualMachineInstanceSpec is a description of a VirtualMachineInstance.",
     "required": [
@@ -4507,6 +4496,17 @@
      }
     }
    },
+   "v1.VirtualMachineInstanceTemplateSpec": {
+    "properties": {
+     "metadata": {
+      "$ref": "#/definitions/v1.ObjectMeta"
+     },
+     "spec": {
+      "description": "VirtualMachineInstance Spec contains the VirtualMachineInstance specification.",
+      "$ref": "#/definitions/v1.VirtualMachineInstanceSpec"
+     }
+    }
+   },
    "v1.VirtualMachineList": {
     "description": "VirtualMachineList is a list of virtualmachines",
     "required": [
@@ -4547,7 +4547,7 @@
      },
      "template": {
       "description": "Template is the direct specification of VirtualMachineInstance",
-      "$ref": "#/definitions/v1.VMTemplateSpec"
+      "$ref": "#/definitions/v1.VirtualMachineInstanceTemplateSpec"
      }
     }
    },

diff --git a/cmd/registry-disk-v1alpha/README.md b/cmd/registry-disk-v1alpha/README.md
@@ -1,19 +1,19 @@
 # KubeVirt Registry Disk Base Container
 
-The KubeVirt Registry Disk Base Container allows users to store VM disks in
-a container registry and attach those disk to VMs automatically using the
+The KubeVirt Registry Disk Base Container allows users to store VMI disks in
+a container registry and attach those disk to VMIs automatically using the
 KubeVirt runtime.
 
 This Base Container is compatible with disk type RegistryDisk:v1alpha
 
 # RegistryDisk:v1alpha
 ## Storing Disks in Container Registry
 
-VM disks can be stored in either qcow2 format or raw format by copying the vm
+VMI disks can be stored in either qcow2 format or raw format by copying the vm
 disk into a container image and uploading that container image to a container
 registry.
 
-Example: Place a bootable VM disk into a container image in the /disk directory
+Example: Place a bootable VMI disk into a container image in the /disk directory
 and upload to the container registry.
 ```
 cat << END > Dockerfile 
@@ -25,13 +25,13 @@ docker build -t vmdisks/fedora25:latest .
 docker push vmdisks/fedora25:latest
 ```
 
-## Assigning Ephemeral Disks to VMs
+## Assigning Ephemeral Disks to VMIs
 
 Assign an ephemeral disk backed by an image in the container registry by
-adding a RegistryDisk:v1alpha disk to the VM definition and supplying
+adding a RegistryDisk:v1alpha disk to the VMI definition and supplying
 the container image as the disk's source name.
 
-Example: Create a KubeVirt VM definition with container backed ephemeral disk.
+Example: Create a KubeVirt VMI definition with container backed ephemeral disk.
 
 ```
 cat << END > vm.yaml
@@ -62,7 +62,7 @@ status: {}
 END
 ```
 
-After creating the VM definition, starting the VM is as simple starting a pod.
+After creating the VMI definition, starting the VMI is as simple starting a pod.
 
 ```
 kubectl create -f vm.yaml

diff --git a/cmd/virt-launcher/virt-launcher.go b/cmd/virt-launcher/virt-launcher.go
@@ -200,10 +200,10 @@ func waitForFinalNotify(deleteNotificationSent chan watch.Event,
 	// There are many conditions that can cause the qemu pid to exit that
 	// don't involve the VirtualMachineInstance's domain from being deleted from libvirt.
 	//
-	// KillVM is idempotent. Making a call to KillVM here ensures that the deletion
+	// KillVMI is idempotent. Making a call to KillVMI here ensures that the deletion
 	// occurs regardless if the VirtualMachineInstance crashed unexpectedly or if virt-handler requested
 	// a graceful shutdown.
-	domainManager.KillVM(vm)
+	domainManager.KillVMI(vm)
 
 	log.Log.Info("Waiting on final notifications to be sent to virt-handler.")
 
@@ -235,7 +235,7 @@ func main() {
 
 	log.InitializeLogging("virt-launcher")
 
-	vm := v1.NewVMReferenceFromNameWithNS(*namespace, *name)
+	vm := v1.NewVMIReferenceFromNameWithNS(*namespace, *name)
 
 	// Initialize local and shared directories
 	initializeDirs(*virtShareDir, *ephemeralDiskDir, *namespace, *name)
@@ -277,7 +277,7 @@ func main() {
 	}
 
 	shutdownCallback := func(pid int) {
-		err := domainManager.KillVM(vm)
+		err := domainManager.KillVMI(vm)
 		if err != nil {
 			log.Log.Reason(err).Errorf("Unable to stop qemu with libvirt, falling back to SIGTERM")
 			syscall.Kill(pid, syscall.SIGTERM)