New URL as discussed with stvogel

doc/api/api.yaml

@@ -125,54 +125,6 @@ paths:
         200:
           description: TODO RESPONSES!
           content: {}
-  /simulations/{SimulationID}/models/{ModelID}:
-    get:
-      tags:
-        - simulations models
-      summary: Get model associated with simulation with ID SimulationID
-      operationId: getModelFromSimulation
-      parameters:
-      - in: path
-        name: SimulationID
-        description: ID of a simulation
-        required: true
-        schema:
-          type: integer
-      - in: path
-        name: ModelID
-        description: ID of a model
-        required: true
-        schema:
-          type: integer
-      responses:
-        200:
-          description: "Model file in zip format"
-          content:
-            application/zip:
-        400:
-          description: PUT Simulation Unknown for ID or unable to save simulation or Model not associated with Simulation
-          content: {}
-    put:
-      tags:
-        - simulations models
-      summary: Update model file for model with ModelID associated with simulation with SimulationID
-      operationId: updateModelForSimulation
-      parameters:
-      - in: path
-        name: SimulationID
-        description: ID of a simulation
-        required: true
-        schema:
-          type: integer
-      requestBody:
-        description: "Model file in zip format"
-        required: true
-        content:
-          application/xml:
-      responses:
-        400:
-          description: PUT Simulation Unknown for ID or unable to save simulation or Model not associated with Simulation
-          content: {}
   /counts:
     get:
       tags:
@@ -475,6 +427,56 @@ paths:
         500:
           description: Unable to find Simulation or unable to save changed simulation or unable to remove SimulationModel
           content: {}
+  /models/{SimulationModelID}/file:
+    get:
+      tags:
+        - simulationmodelfile
+      summary: Get model file from Model with ID SimulationModelID
+      operationId: getModelFromSimulation
+      parameters:
+      - in: path
+        name: SimulationID
+        description: ID of a simulation
+        required: true
+        schema:
+          type: integer
+      - in: path
+        name: ModelID
+        description: ID of a model
+        required: true
+        schema:
+          type: integer
+      responses:
+        200:
+          description: "Model file in zip format"
+          content:
+            x-model/cim-zip:
+              Zipped model file in CIM format
+        400:
+          description: PUT Simulation Unknown for ID or unable to save simulation or Model not associated with Simulation
+          content: {}
+    put:
+      tags:
+        - simulationmodelfile
+      summary: Update model file from Model with ID SimulationModelID
+      operationId: updateModelForSimulation
+      parameters:
+      - in: path
+        name: SimulationID
+        description: ID of a simulation
+        required: true
+        schema:
+          type: integer
+      requestBody:
+        description: "Model file in zip format"
+        required: true
+        content:
+          x-model/cim-zip:
+            Zipped model file in CIM format
+      responses:
+        400:
+          description: PUT Simulation Unknown for ID or unable to save simulation or Model not associated with Simulation
+          content: {}
   /simulators:
     get:
       tags: