From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 5 Feb 2018 18:38:16 +0000 (+0100)
Subject: [IDF] Schema: Add OSA installer stubs
X-Git-Tag: 6.0.0^0
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F51693%2F1;p=pharos.git

[IDF] Schema: Add OSA installer stubs

While at it, order installers by name in IDF schema.

Change-Id: I4bf1dd047a3f7a64b8bc928951fc18c4728a9b68
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/config/pdf/idf-pod1.schema.yaml b/config/pdf/idf-pod1.schema.yaml
index 0705fcc5..b23a82e3 100644
--- a/config/pdf/idf-pod1.schema.yaml
+++ b/config/pdf/idf-pod1.schema.yaml
@@ -14,14 +14,14 @@ definitions:
     v0.1:
       # NOTE: I hope this is going away soon, so I won't model it yet
       type: 'object'
-  daisy:
-    v0.1:
-      type: 'object'
-      # NOTE: To be properly modeled by Daisy maintainers
   compass:
     v0.1:
       type: 'object'
       # NOTE: To be properly modeled by Compass4NFV maintainers
+  daisy:
+    v0.1:
+      type: 'object'
+      # NOTE: To be properly modeled by Daisy maintainers
   fuel:
     v0.1:
       type: 'object'
@@ -75,6 +75,10 @@ definitions:
           additionalProperties: false
       required: ['jumphost', 'network']
       additionalProperties: false
+  osa:
+    v0.1:
+      type: 'object'
+      # NOTE: To be properly modeled by XCI maintainers
 
 ##############################################################################
 # Top-level structure:
@@ -94,14 +98,16 @@ properties:
         type: 'array'
         items:
           type: 'string'
-          enum: ['apex', 'compass4nfv', 'daisy', 'fuel', 'joid']
+          enum: ['apex', 'compass4nfv', 'daisy', 'fuel', 'joid', 'osa']
       net_config:
         type: 'object'
-      fuel:
+      compass:
         type: 'object'
       daisy:
         type: 'object'
-      compass:
+      fuel:
+        type: 'object'
+      osa:
         type: 'object'
     required: ['version']
     additionalProperties: false
@@ -114,16 +120,20 @@ properties:
         properties:
           net_config:
             $ref: '#/definitions/net_config/v0.1'
-          fuel:
-            $ref: '#/definitions/fuel/v0.1'
-          daisy:
-            $ref: '#/definitions/daisy/v0.1'
           compass:
             $ref: '#/definitions/compass/v0.1'
+          daisy:
+            $ref: '#/definitions/daisy/v0.1'
+          fuel:
+            $ref: '#/definitions/fuel/v0.1'
+          osa:
+            $ref: '#/definitions/osa/v0.1'
       fuel:
         required: ['net_config']
       daisy:
         required: ['net_config']
+      osa:
+        required: ['net_config']
 
 # Do not allow any properties not defined here. This lets us catch typos.
 additionalProperties: false