Commit e92a08a5 authored by Laurent Vreck's avatar Laurent Vreck
Browse files

RM editor's notes + RM ./ characters + updated example files

- Removed ./ characters from the beginning of import lines, as per WG SOL request.
- Removed the editor's notes in nsd_types and vnfd_types
- Updated all example files (Annex A and annex E)
parent 3eaef5a6
Loading
Loading
Loading
Loading
Loading
+2 −2
Changes for Example-data/example_A.11-MyExampleNs_big.yaml: 2 added lines, 2 removed lines.
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ topology_template:
  node_templates:
  node_templates:
    MyExampleNS:
    MyExampleNS:
      type: tosca.MyExampleNS
      type: tosca.MyExampleNS
      # properties:
      properties:
        #
        flavour_id : big
      interfaces:
      interfaces:
        Nslcm:
        Nslcm:
          operations:
          operations:
+1 −1
Changes for Example-data/example_A.12-01.yaml: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -48,12 +48,12 @@ topology_template:
        designer: MyCompany
        designer: MyCompany
        version: 1.0.0.0
        version: 1.0.0.0
        name: myExample2Service
        name: myExample2Service
        flavour_id: simple
        invariant_id: aaaa-bbbb-cccc-dddd
        invariant_id: aaaa-bbbb-cccc-dddd
        ns_profile:
        ns_profile:
          ns_instantiation_level: level_1
          ns_instantiation_level: level_1
          min_number_of_instances: 1
          min_number_of_instances: 1
          max_number_of_instances: 3
          max_number_of_instances: 3
          flavour_id: simple


    NS_VL_1:
    NS_VL_1:
      type: tosca.nodes.nfv.NsVirtualLink
      type: tosca.nodes.nfv.NsVirtualLink
−55

File deleted.

+1 −1
Changes for Example-data/example_A.12-etsi_nfv_example_vnf4.yaml: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ node_types:
        type: list
        type: list
        entry_schema:
        entry_schema:
          type: string
          type: string
        constraints: [ equal: [ '0:MyCompany-1.0.0' ] ]
        constraints: [ valid_values: [ [ '0:MyCompany-1.0.0' ] ] ]
        default: [ '0:MyCompany-1.0.0' ]
        default: [ '0:MyCompany-1.0.0' ]
    requirements:
    requirements:
      - virtual_link_1:
      - virtual_link_1:
+1 −1
Changes for Example-data/example_A.13-01.yaml: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ node_types:
        type: list
        type: list
        entry_schema:
        entry_schema:
          type: string
          type: string
        constraints: [ equal: [ '0:MyCompany-1.0.0' ] ]
        constraints: [ valid_values: [ [ '0:MyCompany-1.0.0' ] ] ]
        default: [ '0:MyCompany-1.0.0' ]
        default: [ '0:MyCompany-1.0.0' ]
    interfaces:
    interfaces:
       Vnflcm:
       Vnflcm:
Loading