Remove windows_server and windows_client

GoogleCloudPlatform · Oct 13, 2020 · 038b500 · 038b500
1 parent e55251a
commit 038b500
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/daisy_workflows/image_import/inspection/src/boot_inspect/model.py b/daisy_workflows/image_import/inspection/src/boot_inspect/model.py
@@ -36,8 +36,6 @@ class Distro(enum.Enum):
   SLES = 'sles'
   UBUNTU = 'ubuntu'
   WINDOWS = 'windows'
-  WINDOWS_DESKTOP = 'windows-desktop'
-  WINDOWS_SERVER = 'windows-server'
 
 
 def distro_for(name: str):

diff --git a/daisy_workflows/image_import/inspection/tests/test_model.py b/daisy_workflows/image_import/inspection/tests/test_model.py
@@ -69,18 +69,18 @@ def test_happy_case(self):
     inspection_results = model.InspectionResults(
       device="/dev/sdb",
       os=model.OperatingSystem(
-        distro=model.Distro.WINDOWS_SERVER,
-        version=model.Version(major="6", minor="1"),
+        distro=model.Distro.WINDOWS,
+        version=model.Version(major="8", minor="1"),
       ),
       architecture=model.Architecture.x86,
     )
 
     expected = {
       "device": "/dev/sdb",
       "os": {
-        "distro": "windows-server",
+        "distro": "windows",
         "version": {
-          "major": "6",
+          "major": "8",
           "minor": "1",
         }
       },