Fix issue with Model type in Manifest.go

Signed-off-by: Rule Timothy (VM/EMT3) <Timothy.Rule@de.bosch.com>
boschglobal · Feb 28, 2024 · 64b37bf · 64b37bf
1 parent bea66c6
commit 64b37bf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/code/go/dse/kind/Manifest.go b/code/go/dse/kind/Manifest.go
@@ -24,13 +24,13 @@ type Manifest struct {
 }
 type ManifestKind string
 type ManifestSpec struct {
-	Documentation *[]File      `yaml:"documentation,omitempty"`
-	Models        []Model      `yaml:"models"`
-	Repos         []Repo       `yaml:"repos"`
-	Simulations   []Simulation `yaml:"simulations"`
-	Tools         []Tool       `yaml:"tools"`
+	Documentation *[]File           `yaml:"documentation,omitempty"`
+	Models        []ModelDefinition `yaml:"models"`
+	Repos         []Repo            `yaml:"repos"`
+	Simulations   []Simulation      `yaml:"simulations"`
+	Tools         []Tool            `yaml:"tools"`
 }
-type Model struct {
+type ModelDefinition struct {
 	Arch     *string    `yaml:"arch,omitempty"`
 	Channels *[]Channel `yaml:"channels,omitempty"`
 	Name     string     `yaml:"name"`

diff --git a/doc/content/schemas/yaml/Manifest.md b/doc/content/schemas/yaml/Manifest.md
@@ -206,7 +206,7 @@ documentation:
 |---|---|---|---|
 |repos|[[Repo](#schemarepo)]|true|List of repositories where artifacts used by this simulation may be located.|
 |tools|[[Tool](#schematool)]|true|List of tools used by this simulation.|
-|models|[[Model](#schemamodel)]|true|List of model libraries used by this simulation.|
+|models|[[ModelDefinition](#schemamodeldefinition)]|true|List of model libraries used by this simulation.|
 |simulations|[[Simulation](#schemasimulation)]|true|List of individual simulations which comprise this compositional simulation.|
 |documentation|[[File](#schemafile)]|false|List of documentation files supporting this simulation.|
 
@@ -269,12 +269,12 @@ Define a tool which will be used by the simulation.
 |arch|[string]|false|Architectures of the tool that should be downloaded.|
 |schema|string|false|Define the URI schema for the tool.|
 
-<h2 id="tocS_Model">Model</h2>
+<h2 id="tocS_ModelDefinition">ModelDefinition</h2>
 
-<a id="schemamodel"></a>
-<a id="schema_Model"></a>
-<a id="tocSmodel"></a>
-<a id="tocsmodel"></a>
+<a id="schemamodeldefinition"></a>
+<a id="schema_ModelDefinition"></a>
+<a id="tocSmodeldefinition"></a>
+<a id="tocsmodeldefinition"></a>
 
 ```yaml
 name: string
@@ -384,7 +384,7 @@ Define a model instance, which belongs to a simulation.
 |---|---|---|---|
 |name|string|true|Name of the model instance.|
 |model|string|true|The model library used by this model instance.|
-|channels|[[Model/properties/channels/items](#schemamodel/properties/channels/items)]|true|Indicates how channels are mapped to the model instance.|
+|channels|[[ModelDefinition/properties/channels/items](#schemamodeldefinition/properties/channels/items)]|true|Indicates how channels are mapped to the model instance.|
 |files|[[File](#schemafile)]|false|List of files used by the model instance.|
 
 <h2 id="tocS_Simulation">Simulation</h2>

diff --git a/schemas/yaml/Manifest.yaml b/schemas/yaml/Manifest.yaml
@@ -60,7 +60,7 @@ components:
         models:
           type: array
           description: List of model libraries used by this simulation.
-          items: { $ref: '#/components/schemas/Model' }
+          items: { $ref: '#/components/schemas/ModelDefinition' }
         simulations:
           type: array
           description: >
@@ -128,7 +128,7 @@ components:
           type: string
           description: Define the URI schema for the tool.
 
-    Model:
+    ModelDefinition:
       type: object
       description: >
         Define a model library which will be used by the simulation. A model