Really fix virt-handler test
Need to check that all DS values equal to desired one Signed-off-by: Lukianov Artyom <alukiano@redhat.com>

Need to check that all DS values equal to desired one Signed-off-by: Lukianov Artyom <alukiano@redhat.com>
Apply default values
Fixes #1068 Signed-off-by: Marc Sluiter <msluiter@redhat.com>
rmohr
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/cluster/clean.sh b/cluster/clean.sh
@@ -25,12 +25,12 @@ source hack/config.sh

 echo "Cleaning up ..."

-# Remove finalizers from all running vms, to not block the cleanup
-cluster/kubectl.sh get vms --all-namespaces -o=custom-columns=NAME:.metadata.name,NAMESPACE:.metadata.namespace,FINALIZERS:.metadata.finalizers --no-headers | grep foregroundDeleteVirtualMachine | while read p; do
+# Remove finalizers from all running vmis, to not block the cleanup
+cluster/kubectl.sh get vmis --all-namespaces -o=custom-columns=NAME:.metadata.name,NAMESPACE:.metadata.namespace,FINALIZERS:.metadata.finalizers --no-headers | grep foregroundDeleteVirtualMachine | while read p; do
    arr=($p)
    name="${arr[0]}"
    namespace="${arr[1]}"
-    _kubectl patch vm $name -n $namespace --type=json -p '[{ "op": "remove", "path": "/metadata/finalizers" }]'
+    _kubectl patch vmi $name -n $namespace --type=json -p '[{ "op": "remove", "path": "/metadata/finalizers" }]'
 done

 # Work around https://github.com/kubernetes/kubernetes/issues/33517
diff --git a/cluster/examples/vm-ephemeral.yaml b/cluster/examples/vm-ephemeral.yaml
@@ -1,5 +1,5 @@
 apiVersion: kubevirt.io/v1alpha1
-kind: VirtualMachine
+kind: VirtualMachineInstance
 metadata:
  creationTimestamp: null
  name: vm-ephemeral
diff --git a/cluster/examples/vm-fedora.yaml b/cluster/examples/vm-fedora.yaml
@@ -1,5 +1,5 @@
 apiVersion: kubevirt.io/v1alpha1
-kind: VirtualMachine
+kind: VirtualMachineInstance
 metadata:
  creationTimestamp: null
  name: vm-fedora
diff --git a/cluster/examples/vm-flavor-small.yaml b/cluster/examples/vm-flavor-small.yaml
@@ -1,5 +1,5 @@
 apiVersion: kubevirt.io/v1alpha1
-kind: VirtualMachine
+kind: VirtualMachineInstance
 metadata:
  creationTimestamp: null
  labels:
diff --git a/cluster/examples/vm-nocloud.yaml b/cluster/examples/vm-nocloud.yaml
@@ -1,5 +1,5 @@
 apiVersion: kubevirt.io/v1alpha1
-kind: VirtualMachine
+kind: VirtualMachineInstance
 metadata:
  creationTimestamp: null
  name: vm-nocloud
diff --git a/cluster/examples/vm-preset-small.yaml b/cluster/examples/vm-preset-small.yaml
@@ -1,5 +1,5 @@
 apiVersion: kubevirt.io/v1alpha1
-kind: VirtualMachinePreset
+kind: VirtualMachineInstancePreset
 metadata:
  creationTimestamp: null
  name: vm-preset-small
diff --git a/cluster/examples/vm-pvc.yaml b/cluster/examples/vm-pvc.yaml
@@ -1,5 +1,5 @@
 apiVersion: kubevirt.io/v1alpha1
-kind: VirtualMachine
+kind: VirtualMachineInstance
 metadata:
  creationTimestamp: null
  name: vm-pvc
diff --git a/cluster/examples/vm-replicaset-cirros.yaml b/cluster/examples/vm-replicaset-cirros.yaml
@@ -1,5 +1,5 @@
 apiVersion: kubevirt.io/v1alpha1
-kind: VirtualMachineReplicaSet
+kind: VirtualMachineInstanceReplicaSet
 metadata:
  creationTimestamp: null
  name: vm-replicaset-cirros
diff --git a/cluster/examples/vm-sata.yaml b/cluster/examples/vm-sata.yaml
@@ -1,5 +1,5 @@
 apiVersion: kubevirt.io/v1alpha1
-kind: VirtualMachine
+kind: VirtualMachineInstance
 metadata:
  creationTimestamp: null
  name: vm-sata
diff --git a/cluster/examples/vm-template-fedora.yaml b/cluster/examples/vm-template-fedora.yaml
@@ -0,0 +1,66 @@
+apiVersion: v1
+kind: Template
+metadata:
+  annotations:
+    description: OCP KubeVirt Fedora 27 VM template
+    iconClass: icon-fedora
+    tags: kubevirt,ocp,template,linux
+  creationTimestamp: null
+  labels:
+    kubevirt.io/os: fedora27
+    miq.github.io/kubevirt-is-vm-template: "true"
+  name: vm-template-fedora
+objects:
+- apiVersion: kubevirt.io/v1alpha1
+  kind: OfflineVirtualMachine
+  metadata:
+    creationTimestamp: null
+    labels:
+      kubevirt-ovm: ovm-${NAME}
+    name: ${NAME}
+  spec:
+    running: false
+    template:
+      metadata:
+        creationTimestamp: null
+        labels:
+          kubevirt-ovm: ovm-${NAME}
+      spec:
+        domain:
+          cpu: ${CPU_CORES}
+          devices:
+            disks:
+            - disk:
+                bus: virtio
+              name: registrydisk
+              volumeName: registryvolume
+            - disk:
+                bus: virtio
+              name: cloudinitdisk
+              volumeName: cloudinitvolume
+          machine:
+            type: ""
+          resources:
+            requests:
+              memory: ${MEMORY}
+        terminationGracePeriodSeconds: 0
+        volumes:
+        - name: registryvolume
+          registryDisk:
+            image: kubevirt/fedora-cloud-registry-disk-demo:devel
+        - cloudInitNoCloud:
+            userData: |-
+              #cloud-config
+              password: fedora
+              chpasswd: { expire: False }
+          name: cloudinitvolume
+  status: {}
+parameters:
+- description: Name for the new VM
+  name: NAME
+- description: Amount of memory
+  name: MEMORY
+  value: 4096Mi
+- description: Amount of cores
+  name: CPU_CORES
+  value: "4"
diff --git a/cluster/examples/vm-template-rhel7.yaml b/cluster/examples/vm-template-rhel7.yaml
@@ -0,0 +1,68 @@
+apiVersion: v1
+kind: Template
+metadata:
+  annotations:
+    description: OCP KubeVirt Red Hat Enterprise Linux 7.4 VM template
+    iconClass: icon-rhel
+    tags: kubevirt,ocp,template,linux,virtualmachine
+  creationTimestamp: null
+  labels:
+    kubevirt.io/os: rhel-7.4
+    miq.github.io/kubevirt-is-vm-template: "true"
+  name: vm-template-rhel7
+objects:
+- apiVersion: kubevirt.io/v1alpha1
+  kind: OfflineVirtualMachine
+  metadata:
+    creationTimestamp: null
+    labels:
+      kubevirt-ovm: ovm-${NAME}
+    name: ${NAME}
+  spec:
+    running: false
+    template:
+      metadata:
+        creationTimestamp: null
+        labels:
+          kubevirt-ovm: ovm-${NAME}
+      spec:
+        domain:
+          cpu: ${CPU_CORES}
+          devices:
+            disks:
+            - disk:
+                bus: virtio
+              name: disk0
+              volumeName: disk0-pvc
+          machine:
+            type: ""
+          resources:
+            requests:
+              memory: ${MEMORY}
+        terminationGracePeriodSeconds: 0
+        volumes:
+        - name: disk0-pvc
+          persistentVolumeClaim:
+            claimName: linux-vm-pvc-${NAME}
+  status: {}
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
+    creationTimestamp: null
+    name: linux-vm-pvc-${NAME}
+  spec:
+    accessModes:
+    - ReadWriteOnce
+    resources:
+      requests:
+        storage: 10Gi
+  status: {}
+parameters:
+- description: Name for the new VM
+  name: NAME
+- description: Amount of memory
+  name: MEMORY
+  value: 4096Mi
+- description: Amount of cores
+  name: CPU_CORES
+  value: "4"
diff --git a/cluster/vm-template-windows2012r2.yaml → ...r/examples/vm-template-windows2012r2.yaml b/cluster/vm-template-windows2012r2.yaml → ...r/examples/vm-template-windows2012r2.yaml
@@ -1,78 +1,97 @@
 apiVersion: v1
 kind: Template
 metadata:
-  name: windows2012r2-vm-template
-  console.openshift.io/iconClass: icon-windows
  annotations:
-    description: "OCP KubeVirt Microsoft Windows Server 2012 R2 VM template"
-    tags: "kubevirt,ocp,template,windows,virtualmachine"
+    description: OCP KubeVirt Microsoft Windows Server 2012 R2 VM template
+    iconClass: icon-windows
+    tags: kubevirt,ocp,template,windows,virtualmachine
+  creationTimestamp: null
  labels:
    kubevirt.io/os: win2k12r2
    miq.github.io/kubevirt-is-vm-template: "true"
+  name: vm-template-windows2012r2
 objects:
 - apiVersion: kubevirt.io/v1alpha1
  kind: OfflineVirtualMachine
  metadata:
-    name: ${NAME}
+    creationTimestamp: null
    labels:
      kubevirt-ovm: ovm-${NAME}
+    name: ${NAME}
  spec:
+    running: false
    template:
      metadata:
+        annotations:
+          alpha.kubevirt.io/interface-model: e1000
+        creationTimestamp: null
        labels:
          kubevirt-ovm: ovm-${NAME}
      spec:
        domain:
-          features:
-            acpi: {}
-            apic: {}
-            hyperv:
-              relaxed: {}
-              vapic: {}
-              spinlocks:
-                spinlocks: 8191
          clock:
-            utc: {}
            timer:
              hpet:
                present: false
+              hyperv: {}
              pit:
                tickPolicy: delay
              rtc:
                tickPolicy: catchup
-              hyperv: {}
-          cpu:
-            cores: ${CPU_CORES}
+            utc: {}
+          cpu: ${CPU_CORES}
+          devices:
+            disks:
+            - disk:
+                bus: sata
+              name: pvcdisk
+              volumeName: pvcvolume
+            - disk:
+                bus: virtio
+              name: disk0
+              volumeName: disk0-pvc
+          features:
+            acpi: {}
+            apic: {}
+            hyperv:
+              relaxed: {}
+              spinlocks:
+                spinlocks: 8191
+              vapic: {}
+          firmware:
+            uuid: 5d307ca9-b3ef-428c-8861-06e72d69f223
          machine:
            type: q35
          resources:
            requests:
              memory: ${MEMORY}
-          devices:
-            disks:
-              - name: disk0
-                volumeName: disk0-pvc
+        terminationGracePeriodSeconds: 0
        volumes:
-          - name: disk0-pvc
-            persistentVolumeClaim:
-              claimName: windows-vm-pvc-${NAME}
+        - name: pvcvolume
+          persistentVolumeClaim:
+            claimName: disk-windows
+        - name: disk0-pvc
+          persistentVolumeClaim:
+            claimName: windows-vm-pvc-${NAME}
+  status: {}
 - apiVersion: v1
  kind: PersistentVolumeClaim
  metadata:
+    creationTimestamp: null
    name: windows-vm-pvc-${NAME}
-    #FIXME: add an annotation to specify which volume this pvc should be based on
  spec:
    accessModes:
    - ReadWriteOnce
    resources:
      requests:
        storage: 10Gi
+  status: {}
 parameters:
- name: NAME
-  description: Name for the new VM
- name: MEMORY
-  description: Amount of memory
+- description: Name for the new VM
+  name: NAME
+- description: Amount of memory
+  name: MEMORY
  value: 4096Mi
- name: CPU_CORES
-  description: Amount of cores
+- description: Amount of cores
+  name: CPU_CORES
  value: "4"
diff --git a/cluster/examples/vm-windows.yaml b/cluster/examples/vm-windows.yaml
@@ -1,5 +1,5 @@
 apiVersion: kubevirt.io/v1alpha1
-kind: VirtualMachine
+kind: VirtualMachineInstance
 metadata:
  annotations:
    alpha.kubevirt.io/interface-model: e1000
@@ -36,7 +36,7 @@ spec:
    firmware:
      uuid: 5d307ca9-b3ef-428c-8861-06e72d69f223
    machine:
-      type: ""
+      type: q35
    resources:
      requests:
        memory: 2Gi