remove generic_ioc_image from ioc yaml schema

epics-containers · Sep 28, 2023 · ead95da · ead95da
1 parent b63eec9
commit ead95da
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 32 deletions.
diff --git a/src/ibek/ioc.py b/src/ibek/ioc.py
@@ -190,8 +190,4 @@ class IOC(BaseSettings):
 
     ioc_name: str = Field(description="Name of IOC instance")
     description: str = Field(description="Description of what the IOC does")
-    generic_ioc_image: str = Field(
-        description="The generic IOC container image registry URL"
-    )
-    # this will be replaced in derived classes made by make_ioc_model
     entities: Sequence[Entity]
diff --git a/tests/samples/schemas/multiple.ibek.ioc.schema.json b/tests/samples/schemas/multiple.ibek.ioc.schema.json
@@ -261,11 +261,6 @@
       "title": "Description",
       "type": "string"
     },
-    "generic_ioc_image": {
-      "description": "The generic IOC container image registry URL",
-      "title": "Generic Ioc Image",
-      "type": "string"
-    },
     "entities": {
       "description": "List of entities this IOC instantiates",
       "items": {
@@ -278,7 +273,6 @@
   "required": [
     "ioc_name",
     "description",
-    "generic_ioc_image",
     "entities"
   ],
   "title": "NewIOC",

diff --git a/tests/samples/schemas/objects.ibek.ioc.schema.json b/tests/samples/schemas/objects.ibek.ioc.schema.json
@@ -138,11 +138,6 @@
       "title": "Description",
       "type": "string"
     },
-    "generic_ioc_image": {
-      "description": "The generic IOC container image registry URL",
-      "title": "Generic Ioc Image",
-      "type": "string"
-    },
     "entities": {
       "description": "List of entities this IOC instantiates",
       "items": {
@@ -155,7 +150,6 @@
   "required": [
     "ioc_name",
     "description",
-    "generic_ioc_image",
     "entities"
   ],
   "title": "NewIOC",

diff --git a/tests/samples/schemas/utils.ibek.ioc.schema.json b/tests/samples/schemas/utils.ibek.ioc.schema.json
@@ -97,11 +97,6 @@
       "title": "Description",
       "type": "string"
     },
-    "generic_ioc_image": {
-      "description": "The generic IOC container image registry URL",
-      "title": "Generic Ioc Image",
-      "type": "string"
-    },
     "entities": {
       "description": "List of entities this IOC instantiates",
       "items": {
@@ -114,7 +109,6 @@
   "required": [
     "ioc_name",
     "description",
-    "generic_ioc_image",
     "entities"
   ],
   "title": "NewIOC",

diff --git a/tests/samples/yaml/all.ibek.ioc.yaml b/tests/samples/yaml/all.ibek.ioc.yaml
@@ -2,7 +2,6 @@
 
 ioc_name: test-multiple-ioc
 description: a basic example for testing multiple support definitions
-generic_ioc_image: ghcr.io/epics-containers/ioc-template:23.3.2
 
 entities:
   - type: object_module.RefObject

diff --git a/tests/samples/yaml/bad_counter.ibek.ioc.yaml b/tests/samples/yaml/bad_counter.ibek.ioc.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=../schemas/utils.ibek.ioc.schema.json
 ioc_name: counter
 description: an example motion ioc for ibek testing
-generic_ioc_image: ghcr.io/epics-containers/ioc-pmac:main.run
+
 entities:
   - type: epics.InterruptVectorVME
     name: Vec0

diff --git a/tests/samples/yaml/bad_counter2.ibek.ioc.yaml b/tests/samples/yaml/bad_counter2.ibek.ioc.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=../schemas/utils.ibek.ioc.schema.json
 ioc_name: counter
 description: an example motion ioc for ibek testing
-generic_ioc_image: ghcr.io/epics-containers/ioc-pmac:main.run
+
 entities:
   - type: epics.InterruptVectorVME2
     name: Vec1

diff --git a/tests/samples/yaml/bad_db.ibek.ioc.yaml b/tests/samples/yaml/bad_db.ibek.ioc.yaml
@@ -1,6 +1,5 @@
 ioc_name: test-bad-db-ioc
 description: demo bad database definition
-generic_ioc_image: ghcr.io/epics-containers/ioc-template:23.3.2
 
 entities:
   - type: object_module.RefObject

diff --git a/tests/samples/yaml/bad_default.ibek.ioc.yaml b/tests/samples/yaml/bad_default.ibek.ioc.yaml
@@ -2,7 +2,6 @@
 
 ioc_name: test-bad-defaults-ioc
 description: a basic example for testing multiple support definitions
-generic_ioc_image: ghcr.io/epics-containers/ioc-template:23.3.2
 
 entities:
   # deliberately do not specify name to test failure case for no default

diff --git a/tests/samples/yaml/bad_ref.ibek.ioc.yaml b/tests/samples/yaml/bad_ref.ibek.ioc.yaml
@@ -2,7 +2,6 @@
 
 ioc_name: test-multiple-ioc
 description: demo bad object reference
-generic_ioc_image: ghcr.io/epics-containers/ioc-template:23.3.2
 
 entities:
   - type: object_module.RefObject

diff --git a/tests/samples/yaml/objects.ibek.ioc.yaml b/tests/samples/yaml/objects.ibek.ioc.yaml
@@ -2,7 +2,6 @@
 
 ioc_name: test-object-ioc
 description: a basic example for testing ioc-template
-generic_ioc_image: ghcr.io/epics-containers/ioc-template:23.3.2
 
 entities:
   - type: object_module.RefObject

diff --git a/tests/samples/yaml/utils.ibek.ioc.yaml b/tests/samples/yaml/utils.ibek.ioc.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=../schemas/utils.ibek.ioc.schema.json
 ioc_name: counter
 description: an example motion ioc for ibek testing
-generic_ioc_image: ghcr.io/epics-containers/ioc-pmac:main.run
+
 entities:
   - type: epics.InterruptVectorVME
     name: Vec0
diff --git a/tests/test_render.py b/tests/test_render.py
@@ -64,7 +64,6 @@ def test_database_render(objects_classes, templates):
     ioc = IOC(
         ioc_name="test_ioc",
         description="for testing",
-        generic_ioc_image="test_ioc_img",
         entities=[],
     )
 

diff --git a/tests/test_unit.py b/tests/test_unit.py
@@ -45,7 +45,6 @@ def test_object_references():
             dict(type="mymodule.port", name="PORT"),
             dict(type="mymodule.device", port="PORT"),
         ],
-        generic_ioc_image="",
     )
     ioc = ioc_model(**d)
     port, device = ioc.entities