X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osmclient%2Ftemplates%2Fnsd.yaml.j2;h=f0ec25a6c94408f9819f1b9f748953ce39ac16c3;hb=134d87495b22e068a39616ae61860d2be803b7a9;hp=0e0c7a315e86ada3cc69f0ce556ba18a3d90330e;hpb=70208ca1de7ff0e91a17d8f918d5b6044e9fa388;p=osm%2Fosmclient.git diff --git a/osmclient/templates/nsd.yaml.j2 b/osmclient/templates/nsd.yaml.j2 index 0e0c7a3..f0ec25a 100644 --- a/osmclient/templates/nsd.yaml.j2 +++ b/osmclient/templates/nsd.yaml.j2 @@ -1,5 +1,3 @@ -# Copyright 2019 ETSI OSM -# # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -13,181 +11,39 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -nsd-catalog: - schema-version: "v3.0" - nsd: - - id: {{ name }}_nsd - name: {{ name }}_nsd - short-name: {{ name }}_nsd - vendor: {{ vendor }} - description: Generated by OSM package generator - version: '1.0' - {%- if detailed is sameas true %} - - # Place the logo as png in icons directory and provide the name here - # logo: Example: icons/logo.png - {%- endif %} - - # Specify the VNFDs that are part of this NSD - constituent-vnfd: - # The member-vnf-index needs to be unique, starting from 1 - # vnfd-id-ref is the id of the VNFD - # Multiple constituent VNFDs can be specified - - member-vnf-index: "1" - vnfd-id-ref: {{ name }}_vnfd - {%- if detailed is sameas true %} - # start-by-default: True - {%- endif %} - - # Networks for the VNFs - vld: - - id: {{ name }}_nsd_vld0 - name: mgmt - short-name: mgmt - type: ELAN - mgmt-network: true - {%- if detailed is sameas true %} - # description: - # vim-network-name: Name of network in VIM account - # ip-profile-ref: Name of reference of IP profile object - # provider-network: - # physical-network: Name of the physical network on which provider network is built - # segmentation_id: ID of segregated virtual network - {%- endif %} - - # Specify the constituent VNFs - # member-vnf-index-ref - entry from constituent vnf - # vnfd-id-ref - VNFD id - # vnfd-connection-point-ref - connection point name in the VNFD - vnfd-connection-point-ref: - - member-vnf-index-ref: "1" - vnfd-id-ref: {{ name }}_vnfd - # NOTE: Validate the entry below - vnfd-connection-point-ref: vnf-cp0 - {%- if detailed is sameas true %} - # ip-address: IP address of the connection point - {%- endif %} - - {%- for x in range(1, interfaces + 1 ) %} - - member-vnf-index-ref: "1" - vnfd-id-ref: {{ name }}_vnfd - # NOTE: Validate the entry below - vnfd-connection-point-ref: vnf-cp{{ x }} - {%- if detailed is sameas true %} - # ip-address: IP address of the connection point - {%- endif %} - {%- endfor %} - +nsd: + nsd: + - id: {{ name }}_nsd + name: {{ name }}_nsd + designer: {{ vendor }} + description: Generated by OSM package generator + version: '1.0' + vnfd-id: + - {{ name }}_vnfd + df: + - id: default-df + vnf-profile: + - id: "1" + vnfd-id: {{ name }}_vnfd + virtual-link-connectivity: + - virtual-link-profile-id: {{ name }}_nsd_vld0 + constituent-cpd-id: + - constituent-base-element-id: "1" + constituent-cpd-id: vnf-cp0-ext {%- if detailed is sameas true %} - # List of IP Profiles. - # IP Profile describes the IP characteristics for the Virtual-Link - #ip-profiles - #- name: - # description: - # ip-profile-params: - # - ip-version: - # subnet-address: - # gateway-address: - # security-group: - # subnet-prefix-pool: - # dns-server: - # - address: - # dhcp-params: - # - enabled: - # start-address: - # count: - - # Information about NS configuration - #ns-configuration: - # juju: - # charm: - # proxy: - # vca-relationships: - # relation: - # - requires: - # provides: - - # # List of config primitives supported by the - # # configuration agent for this NS. - # config-primitive: - # - name: - # parameter: - # - name: - # data-type: - # mandatory: - # default-value: - # parameter-pool: - # read-only: - # hidden: - - # # Initial set of configuration primitives. - # initial-config-primitive: - # - seq: - # name: - # parameter: - # - name: - # data-type: - # value: - - # # Terminate set of configuration primitives. - # terminate-config-primitive: - # - seq: - # name: - # parameter: - # - name: - # data-type: - # value: - - # # List of VCA related metric - # metrics: - # - name: - - # Used to configure the list of public keys to be injected as part - # of ns instantiation - #key-pair: - #- name: - # key: - - # List of users to be added through cloud-config - #user: - #- name: - # user-info: - # key-pair: - # - name: - # key: - - # List of VNF Forwarding Graph Descriptors (VNFFGD) - #vnffgd: - #- id: - # name: - # short-name: - # vendor: - # description: - # version: - # # List of Rendered Service Paths - # rsp: - # - id: - # name: - # vnfd-connection-point-ref: - # - member-vnf-index-ref: - # order: - # vnfd-id-ref: - # vnfd-ingress-connection-point-ref: - # vnfd-egress-connection-point-ref: - # # List of classifier rules - # classifier: - # - id: - # name: - # rsp-id-ref: - # member-vnf-index-ref: - # vnfd-id-ref: - # vnfd-connection-point-ref: - # match-attributes: - # - id: - # ip-proto: - # source-ip-address: - # destination-ip-address: - # source-port: - # destination-port: + # ip-address: IP address of the connection point {%- endif %} + virtual-link-desc: + - id: {{ name }}_nsd_vld0 + mgmt-network: true + {%- if detailed is sameas true %} + #vim-network-name: Name of network in VIM account + {%- endif %} + {%- if detailed is sameas true %} + #ns-configuration: + #relation: + #- name: relation + # entities: + # - id: "1" + # endpoint: interface + {%- endif %} \ No newline at end of file