From d6d7efe837dff4ba808b8dfeb7efa35ccbb8a2a2 Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Wed, 21 Sep 2016 14:05:26 +0530 Subject: [PATCH] Update descriptors for R1 schema Signed-off-by: Philip Joseph --- src/nsd/VyOS_ns/VyOS_nsd.yaml | 2 + src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml | 6 + src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml | 2 + src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml | 4 + src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml | 6 + src/vnfd/6wind_vnf/6WindTR1.1.2__vnfd.yaml | 184 +++++++++--------- src/vnfd/VyOS_vnf/VyOS__vnfd.yaml | 64 +++--- .../ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml | 74 +++---- 8 files changed, 181 insertions(+), 161 deletions(-) diff --git a/src/nsd/VyOS_ns/VyOS_nsd.yaml b/src/nsd/VyOS_ns/VyOS_nsd.yaml index 041817e..3344baa 100644 --- a/src/nsd/VyOS_ns/VyOS_nsd.yaml +++ b/src/nsd/VyOS_ns/VyOS_nsd.yaml @@ -11,6 +11,7 @@ nsd:nsd-catalog: vld: - id: data name: data + short-name: data type: ELAN provider-network: overlay-type: VLAN @@ -20,6 +21,7 @@ nsd:nsd-catalog: vnfd-id-ref: VyOS - id: management name: management + short-name: management type: ELAN provider-network: overlay-type: VLAN diff --git a/src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml b/src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml index 34caf2d..eb8a325 100644 --- a/src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml +++ b/src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml @@ -13,6 +13,7 @@ nsd:nsd-catalog: vld: - id: connection_0 name: connection_0 + short-name: connection_0 type: ELAN provider-network: overlay-type: VLAN @@ -23,6 +24,7 @@ nsd:nsd-catalog: vnfd-id-ref: gw_corpA_PE1 - id: connection_1 name: connection_1 + short-name: connection_1 type: ELAN provider-network: overlay-type: VLAN @@ -33,6 +35,7 @@ nsd:nsd-catalog: vnfd-id-ref: gw_corpA_PE2 - id: connection_2 name: connection_2 + short-name: connection_2 type: ELAN provider-network: overlay-type: VLAN @@ -43,6 +46,7 @@ nsd:nsd-catalog: vnfd-id-ref: gw_corpA_PE1 - id: connection_3 name: connection_3 + short-name: connection_3 type: ELAN provider-network: overlay-type: VLAN @@ -53,6 +57,7 @@ nsd:nsd-catalog: vnfd-id-ref: gw_corpA_PE2 - id: connection_4 name: connection_4 + short-name: connection_4 type: ELAN provider-network: overlay-type: VLAN @@ -64,6 +69,7 @@ nsd:nsd-catalog: vnfd-id-ref: gw_corpA_PE1 - id: connection_5 name: connection_5 + short-name: connection_5 type: ELAN provider-network: overlay-type: VLAN diff --git a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml index 27a1197..9283995 100644 --- a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml +++ b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml @@ -11,6 +11,7 @@ nsd:nsd-catalog: vld: - id: data name: data + short-name: data type: ELAN provider-network: overlay-type: VLAN @@ -22,6 +23,7 @@ nsd:nsd-catalog: vnfd-id-ref: IMS-ALLIN1_2p - id: management name: management + short-name: management type: ELAN provider-network: overlay-type: VLAN diff --git a/src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml b/src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml index 534b52a..9e6f887 100644 --- a/src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml +++ b/src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml @@ -11,6 +11,7 @@ nsd:nsd-catalog: vld: - id: connection 0 name: connection 0 + short-name: connection 0 type: ELAN provider-network: overlay-type: VLAN @@ -21,6 +22,7 @@ nsd:nsd-catalog: vnfd-id-ref: mwc16gen - id: connection 1 name: connection 1 + short-name: connection 1 type: ELAN provider-network: overlay-type: VLAN @@ -31,6 +33,7 @@ nsd:nsd-catalog: vnfd-id-ref: mwc16gen - id: connection 2 name: connection 2 + short-name: connection 2 type: ELAN provider-network: overlay-type: VLAN @@ -42,6 +45,7 @@ nsd:nsd-catalog: vnfd-id-ref: mwc16gen - id: connection 3 name: connection 3 + short-name: connection 3 type: ELAN provider-network: overlay-type: VLAN diff --git a/src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml b/src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml index 64f9fc3..67b5102 100644 --- a/src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml +++ b/src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml @@ -15,6 +15,7 @@ nsd:nsd-catalog: vld: - id: 6WindTR1.1.2__3 to OpenStack name: 6WindTR1.1.2__3 to OpenStack + short-name: 6WindTR1.1.2__3 to OpenStack type: ELAN provider-network: overlay-type: VLAN @@ -25,6 +26,7 @@ nsd:nsd-catalog: vnfd-id-ref: 6WindTR1.1.2 - id: 6WindTR1.1.2__1 enty point name: 6WindTR1.1.2__1 enty point + short-name: 6WindTR1.1.2__1 enty point type: ELAN provider-network: overlay-type: VLAN @@ -35,6 +37,7 @@ nsd:nsd-catalog: vnfd-id-ref: 6WindTR1.1.2 - id: 6WindTR1.1.2__2 entry point name: 6WindTR1.1.2__2 entry point + short-name: 6WindTR1.1.2__2 entry point type: ELAN provider-network: overlay-type: VLAN @@ -45,6 +48,7 @@ nsd:nsd-catalog: vnfd-id-ref: 6WindTR1.1.2 - id: management name: management + short-name: management provider-network: overlay-type: VLAN physical-network: mgmt @@ -61,6 +65,7 @@ nsd:nsd-catalog: vnfd-id-ref: 6WindTR1.1.2 - id: 6WindTR1.1.2__2-6WindTR1.1.2__3 name: 6WindTR1.1.2__2-6WindTR1.1.2__3 + short-name: 6WindTR1.1.2__2-6WindTR1.1.2__3 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '2' @@ -81,6 +86,7 @@ nsd:nsd-catalog: vnfd-id-ref: 6WindTR1.1.2 - id: 6WindTR1.1.2__1-6WindTR1.1.2__2 name: 6WindTR1.1.2__1-6WindTR1.1.2__2 + short-name: 6WindTR1.1.2__1-6WindTR1.1.2__2 type: ELAN vnfd-connection-point-ref: - member-vnf-index-ref: '1' diff --git a/src/vnfd/6wind_vnf/6WindTR1.1.2__vnfd.yaml b/src/vnfd/6wind_vnf/6WindTR1.1.2__vnfd.yaml index 5b8bffc..a048b96 100644 --- a/src/vnfd/6wind_vnf/6WindTR1.1.2__vnfd.yaml +++ b/src/vnfd/6wind_vnf/6WindTR1.1.2__vnfd.yaml @@ -6,98 +6,98 @@ vnfd:vnfd-catalog: logo: 6wind_2x.png mgmt-interface: vdu-id: VM - vnf-configuration: - config-attributes: - config-delay: '0' - config-priority: '0' - config-primitive: - - name: configure-interface - parameter: - - name: iface-name - data-type: STRING - mandatory: 'true' - - name: cidr - data-type: STRING - - name: add-corporation - parameter: - - name: domain-name - data-type: STRING - mandatory: 'true' - - name: iface-name - data-type: STRING - mandatory: 'true' - - name: vlan-id - data-type: INTEGER - mandatory: 'true' - - name: cidr - data-type: STRING - mandatory: 'true' - - name: area - data-type: STRING - mandatory: 'true' - - name: subnet-cidr - data-type: STRING - mandatory: 'true' - - name: subnet-area - data-type: STRING - mandatory: 'true' - - name: delete-corporation - parameter: - - name: domain-name - data-type: STRING - mandatory: 'true' - - name: cidr - data-type: STRING - mandatory: 'true' - - name: area - data-type: STRING - mandatory: 'true' - - name: subnet-cidr - data-type: STRING - mandatory: 'true' - - name: subnet-area - data-type: STRING - mandatory: 'true' - - name: connect-domains - parameter: - - name: domain-name - data-type: STRING - mandatory: 'true' - - name: iface-name - data-type: STRING - mandatory: 'true' - - name: tunnel-name - data-type: STRING - mandatory: 'true' - - name: local-ip - data-type: STRING - mandatory: 'true' - - name: remote-ip - data-type: STRING - mandatory: 'true' - - name: tunnel-key - data-type: STRING - mandatory: 'true' - - name: internal-local-ip - data-type: STRING - mandatory: 'true' - - name: internal-remote-ip - data-type: STRING - mandatory: 'true' - - name: tunnel-type - data-type: STRING - mandatory: 'false' - default-value: 'gre' - - name: delete-domain-connection - parameter: - - name: domain-name - data-type: STRING - mandatory: 'true' - - name: tunnel-name - data-type: STRING - mandatory: 'true' - juju: - charm: vpe-router + vnf-configuration: + config-attributes: + config-delay: '0' + config-priority: '0' + config-primitive: + - name: configure-interface + parameter: + - name: iface-name + data-type: STRING + mandatory: 'true' + - name: cidr + data-type: STRING + - name: add-corporation + parameter: + - name: domain-name + data-type: STRING + mandatory: 'true' + - name: iface-name + data-type: STRING + mandatory: 'true' + - name: vlan-id + data-type: INTEGER + mandatory: 'true' + - name: cidr + data-type: STRING + mandatory: 'true' + - name: area + data-type: STRING + mandatory: 'true' + - name: subnet-cidr + data-type: STRING + mandatory: 'true' + - name: subnet-area + data-type: STRING + mandatory: 'true' + - name: delete-corporation + parameter: + - name: domain-name + data-type: STRING + mandatory: 'true' + - name: cidr + data-type: STRING + mandatory: 'true' + - name: area + data-type: STRING + mandatory: 'true' + - name: subnet-cidr + data-type: STRING + mandatory: 'true' + - name: subnet-area + data-type: STRING + mandatory: 'true' + - name: connect-domains + parameter: + - name: domain-name + data-type: STRING + mandatory: 'true' + - name: iface-name + data-type: STRING + mandatory: 'true' + - name: tunnel-name + data-type: STRING + mandatory: 'true' + - name: local-ip + data-type: STRING + mandatory: 'true' + - name: remote-ip + data-type: STRING + mandatory: 'true' + - name: tunnel-key + data-type: STRING + mandatory: 'true' + - name: internal-local-ip + data-type: STRING + mandatory: 'true' + - name: internal-remote-ip + data-type: STRING + mandatory: 'true' + - name: tunnel-type + data-type: STRING + mandatory: 'false' + default-value: 'gre' + - name: delete-domain-connection + parameter: + - name: domain-name + data-type: STRING + mandatory: 'true' + - name: tunnel-name + data-type: STRING + mandatory: 'true' + juju: + charm: vpe-router connection-point: - name: eth0 type: VPORT diff --git a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml index 2ff7032..af6a4a3 100644 --- a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml +++ b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml @@ -7,38 +7,38 @@ vnfd:vnfd-catalog: logo: osm_2x.png mgmt-interface: vdu-id: VyOS-VM - vnf-configuration: - config-attributes: - config-delay: '0' - config-priority: '1' - config-primitive: - - name: config - parameter: - - name: user - data-type: STRING - mandatory: 'true' - default-value: vyos - - name: pass - data-type: string - mandatory: 'true' - default-value: vyos - - name: ping - parameter: - - name: destination - data-type: STRING - mandatory: 'true' - - name: count - data-type: INTEGER - mandatory: 'false' - default-value: 5 - initial-config-primitive: - - name: config - parameter: - - name: hostname - value: - seq: '1' - juju: - charm: VyOS-proxy + vnf-configuration: + config-attributes: + config-delay: '0' + config-priority: '1' + config-primitive: + - name: config + parameter: + - name: user + data-type: STRING + mandatory: 'true' + default-value: vyos + - name: pass + data-type: string + mandatory: 'true' + default-value: vyos + - name: ping + parameter: + - name: destination + data-type: STRING + mandatory: 'true' + - name: count + data-type: INTEGER + mandatory: 'false' + default-value: 5 + initial-config-primitive: + - name: config + parameter: + - name: hostname + value: + seq: '1' + juju: + charm: VyOS-proxy connection-point: - name: eth0 type: VPORT diff --git a/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml b/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml index b36941a..d02fc0b 100644 --- a/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml +++ b/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml @@ -7,43 +7,43 @@ vnfd:vnfd-catalog: logo: metaswitch_2x.png mgmt-interface: vdu-id: IMS-ALLIN1_2p-VM - vnf-configuration: - config-attributes: - config-delay: '0' - config-priority: '1' - config-primitive: - - name: config - parameter: - - name: home_domain - data-type: STRING - mandatory: 'true' - default-value: ims.com - - name: password - data-type: string - mandatory: 'true' - name: password - default-value: cw-aio - - name: create-update-user - parameter: - - name: number - data-type: STRING - mandatory: 'true' - - name: password - data-type: STRING - mandatory: 'true' - - name: delete-user - parameter: - - name: number - data-type: STRING - mandatory: 'true' - initial-config-primitive: - - name: config - parameter: - - name: proxied_ip - value: - seq: '1' - juju: - charm: clearwater-aio-proxy + vnf-configuration: + config-attributes: + config-delay: '0' + config-priority: '1' + config-primitive: + - name: config + parameter: + - name: home_domain + data-type: STRING + mandatory: 'true' + default-value: ims.com + - name: password + data-type: string + mandatory: 'true' + name: password + default-value: cw-aio + - name: create-update-user + parameter: + - name: number + data-type: STRING + mandatory: 'true' + - name: password + data-type: STRING + mandatory: 'true' + - name: delete-user + parameter: + - name: number + data-type: STRING + mandatory: 'true' + initial-config-primitive: + - name: config + parameter: + - name: proxied_ip + value: + seq: '1' + juju: + charm: clearwater-aio-proxy connection-point: - name: eth0 type: VPORT -- 2.25.1