Merge pull request #70 from sonata-nfv/master

Update 4.0 branch
sonata-nfv · Sep 10, 2018 · 1afff54 · 1afff54
2 parents cd15187 + 7b73b06
commit 1afff54
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/slice-descriptor/examples/slice-template-example.yml b/slice-descriptor/examples/slice-template-example.yml
@@ -44,8 +44,15 @@ author: "Pol"
 ##id: "8638af98-789f-462f-a373-ffc67527d82f"
 name: "Rubik_NST"
 notificationTypes: "NstOnboardingNotification"
-nstNsdIds:
-    - "6a01afdc-9d42-4bc9-866c-a8a3868fdf5e"
+sliceServices:
+    - servID: "6a01afdc-9d42-4bc9-866c-a8a3868fdf5e"
+      servname: "ns-squid-haprox_1"
+      slaID: "aabbccdd-9d42-4bc9-866c-a8a3868fdf5e"
+    - servID: "eeff1122-9d42-4bc9-866c-a8a3868fdf5e"
+      servname: "ns-squid-haprox_2"
+      slaID: "44556677-9d42-4bc9-866c-a8a3868fdf5e"
+    - servID: "99887766-9d42-4bc9-866c-a8a3868fdf5e"
+      servname: "ns-squid-haprox_3"
 onboardingState: "ENABLED"
 operationalState: "ENABLED"
 usageState: "NOT_IN_USE"

diff --git a/slice-descriptor/nst-schema.yml b/slice-descriptor/nst-schema.yml
@@ -55,12 +55,30 @@ properties:
     description: "The name of the NST"
     type: "string"
     pattern: "^[a-zA-Z0-9\\-_.]+$"
-  nstNsdIds:
+  sliceServices:
     description: "The list of Network Services uuids composing the NST"
     type: "array"
     items:
-      type: "string"
-      pattern: "^[a-zA-Z0-9\\-_.]+$"
+      #type: "string"
+      #pattern: "^[a-zA-Z0-9\\-_.]+$"
+      description: "A service uuid with related parameters (i.e slaId)"
+      type: "object"
+      properties:
+        servID:
+          description: "An arbitrary description of the FSM."
+          type: "string"
+          pattern: "^[a-zA-Z0-9\\-_.]+$"
+        servname:
+          description: "The name of the selected service to instantiate."
+          type: "string"
+          pattern: "^[a-zA-Z0-9\\-_.]+$"
+        slaID:
+          description: "A unique identifier of this FSM within the scope of this VNF descriptor."
+          type: "string"
+          pattern: "^[a-zA-Z0-9\\-_.]+$"
+      required:
+        - servID
+        - servname
     minItems: 1
   onboardingState:
     description: "Defines the onboarding state (ENABLE, DISABLED)."
@@ -137,7 +155,7 @@ required:
   - descriptor_schema
   - name 
 #  - id
-  - nstNsdIds
+  - sliceServices
   - version
   - vendor
 additionalProperties: true