From: velandy Date: Wed, 29 Mar 2017 20:47:01 +0000 (-0400) Subject: Revert "FlowNAC updated descriptors (plugtest)" X-Git-Tag: v1.1.1 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2081119c246fefb7b2fe7dbc7b7b23eeac18bb76;p=osm%2Fdescriptor-packages.git Revert "FlowNAC updated descriptors (plugtest)" This reverts commit fc29c45c2c63425ca1f634347f00e829ab14d9e3. --- diff --git a/Makefile b/Makefile index 358036e..f41ed9f 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,6 @@ VNFD_BUILD_PKGS := $(addprefix $(VNFD_BUILD_DIR)_pkgs/, $(VNFD_PKGS)) IMS_GITHUB="https://github.com/Metaswitch/clearwater-juju.git" CHARM_REPO="https://osm.etsi.org/gerrit/osm/juju-charms.git" -JUJU_DIR = /home/jokin/dev/osm all: $(VNFD_BUILD_PKGS) ${NSD_BUILD_PKGS} echo $@ @@ -90,21 +89,5 @@ $(VNFD_BUILD_DIR)/pong_vnf/charms/pingpong: $(VNFD_BUILD_DIR)/pong_vnf $(BUILD_D # Copy the pingpong Charm into the pong vnf package directory before packaging cp -rf $(BUILD_DIR)/juju-charms/builds/pingpong $(VNFD_BUILD_DIR)/pong_vnf/charms -$(VNFD_BUILD_DIR)/knt_fnc_vnf/charms/flownac: $(VNFD_BUILD_DIR)/knt_fnc_vnf $(BUILD_DIR)/juju-charms - # Copy the FlowNAC Charm into the FNC vnf package directory before packaging - cp -rf $(JUJU_DIR)/juju-charms/builds/flownac $(VNFD_BUILD_DIR)/knt_fnc_vnf/charms - -$(VNFD_BUILD_DIR)/knt_fne_vnf/charms/flownac: $(VNFD_BUILD_DIR)/knt_fne_vnf $(BUILD_DIR)/juju-charms - # Copy the FlowNAC Charm into the FNE vnf package directory before packaging - cp -rf $(JUJU_DIR)/juju-charms/builds/flownac $(VNFD_BUILD_DIR)/knt_fne_vnf/charms - -$(VNFD_BUILD_DIR)/knt_fnd_vnf/charms/flownac: $(VNFD_BUILD_DIR)/knt_fnd_vnf $(BUILD_DIR)/juju-charms - # Copy the FlowNAC Charm into the FND vnf package directory before packaging - cp -rf $(JUJU_DIR)/juju-charms/builds/flownac $(VNFD_BUILD_DIR)/knt_fnd_vnf/charms - -$(VNFD_BUILD_DIR)/knt_fnu_vnf/charms/flownac: $(VNFD_BUILD_DIR)/knt_fnu_vnf $(BUILD_DIR)/juju-charms - # Copy the FlowNAC Charm into the FNU vnf package directory before packaging - cp -rf $(JUJU_DIR)/juju-charms/builds/flownac $(VNFD_BUILD_DIR)/knt_fnu_vnf/charms - -$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router $(VNFD_BUILD_DIR)/VyOS_vnf/charms/vyos-proxy $(VNFD_BUILD_DIR)/ping_vnf/charms/pingpong $(VNFD_BUILD_DIR)/pong_vnf/charms/pingpong $(VNFD_BUILD_DIR)/knt_fnc_vnf/charms/flownac $(VNFD_BUILD_DIR)/knt_fne_vnf/charms/flownac $(VNFD_BUILD_DIR)/knt_fnd_vnf/charms/flownac $(VNFD_BUILD_DIR)/knt_fnu_vnf/charms/flownac +$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router $(VNFD_BUILD_DIR)/VyOS_vnf/charms/vyos-proxy $(VNFD_BUILD_DIR)/ping_vnf/charms/pingpong $(VNFD_BUILD_DIR)/pong_vnf/charms/pingpong src/generate_descriptor_pkg.sh -d $(BUILD_DIR)/vnfd_pkgs $< diff --git a/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml b/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml index 9fe6e19..b93c74a 100755 --- a/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml +++ b/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml @@ -15,87 +15,46 @@ # # vnfd:vnfd-catalog: - vnfd: - - vendor: Keynetic Technologies - version: '0.3' - description: FlowNAC Control - id: fnc - name: Keynetic-FNC - short-name: KNT-FNC - logo: flownac.png - service-function-chain: UNAWARE - vnf-configuration: - config-attributes: - config-delay: 10 - service-primitive: - - name: config - parameter: - - name: ssh-hostname - data-type: STRING - mandatory: 'true' - default-value: - - name: ssh-username - data-type: STRING - mandatory: 'true' - default-value: flownac - - name: ssh-password - data-type: STRING - mandatory: 'true' - default-value: fnac@osm - - name: mode - data-type: STRING - read-only: 'true' - default-value: fnc - - name: start - - name: stop - - name: restart - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: flownac - - name: ssh-password - value: fnac@osm - - name: mode - value: fnc - seq: '1' - - name: start - seq: '2' - juju: - charm: flownac - connection-point: - - id: mgmt - name: mgmt - type: VPORT - - id: auth - name: auth - type: VPORT - - id: ctrl - name: ctrl - type: VPORT - vdu: - - description: FNC VDU - external-interface: - - name: eth0 - virtual-interface: - type: OM-MGMT - vnfd-connection-point-ref: mgmt - - name: auth - virtual-interface: - type: VIRTIO - vnfd-connection-point-ref: auth - - name: ctrl - virtual-interface: - type: VIRTIO - vnfd-connection-point-ref: ctrl - guest-epa: - cpu-pinning-policy: ANY - id: fnc-vdu - image: /var/lib/libvirt/images/fnc.qcow2 - name: fnc-vdu - vm-flavor: - memory-mb: '1024' - storage-gb: '4' - vcpu-count: '1' + vnfd:vnfd: + - vnfd:vendor: Keynetic Technologies + vnfd:version: '0.3' + vnfd:description: FlowNAC Control + vnfd:id: fnc + vnfd:name: Keynetic-FNC + vnfd:short-name: KNT-FNC + vnfd:logo: flownac.png + vnfd:service-function-chain: UNAWARE + vnfd:connection-point: + - vnfd:id: mgmt + vnfd:name: mgmt + vnfd:type: VPORT + - vnfd:id: auth + vnfd:name: auth + vnfd:type: VPORT + - vnfd:id: ctrl + vnfd:name: ctrl + vnfd:type: VPORT + vnfd:vdu: + - vnfd:description: FNC VDU + vnfd:external-interface: + - vnfd:name: eth0 + vnfd:virtual-interface: + vnfd:type: OM-MGMT + vnfd:vnfd-connection-point-ref: mgmt + - vnfd:name: auth + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: auth + - vnfd:name: ctrl + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: ctrl + vnfd:guest-epa: + vnfd:cpu-pinning-policy: ANY + vnfd:id: fnc-vdu + vnfd:image: /var/lib/libvirt/images/fnc.img + vnfd:name: fnc-vdu + vnfd:vm-flavor: + vnfd:memory-mb: '1024' + vnfd:storage-gb: '4' + vnfd:vcpu-count: '1' diff --git a/src/vnfd/knt_fnd_vnf/knt_fnd__vnfd.yaml b/src/vnfd/knt_fnd_vnf/knt_fnd__vnfd.yaml index 75a2c27..7aac7aa 100755 --- a/src/vnfd/knt_fnd_vnf/knt_fnd__vnfd.yaml +++ b/src/vnfd/knt_fnd_vnf/knt_fnd__vnfd.yaml @@ -15,80 +15,39 @@ # # vnfd:vnfd-catalog: - vnfd: - - vendor: Keynetic Technologies - version: '0.3' - description: Keynetic Data Service - id: fnd - name: Keynetic-FND - short-name: KNT-FND - logo: keynetic.png - service-function-chain: UNAWARE - vnf-configuration: - config-attributes: - config-delay: 10 - service-primitive: - - name: config - parameter: - - name: ssh-hostname - data-type: STRING - mandatory: 'true' - default-value: - - name: ssh-username - data-type: STRING - mandatory: 'true' - default-value: flownac - - name: ssh-password - data-type: STRING - mandatory: 'true' - default-value: fnac@osm - - name: mode - data-type: STRING - read-only: 'true' - default-value: fnd - - name: start - - name: stop - - name: restart - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: flownac - - name: ssh-password - value: fnac@osm - - name: mode - value: fnd - seq: '1' - - name: start - seq: '2' - juju: - charm: flownac - connection-point: - - id: mgmt - name: mgmt - type: VPORT - - id: data - name: data - type: VPORT - vdu: - - description: FND VDU - external-interface: - - name: eth0 - virtual-interface: - type: OM-MGMT - vnfd-connection-point-ref: mgmt - - name: data - virtual-interface: - type: VIRTIO - vnfd-connection-point-ref: data - guest-epa: - cpu-pinning-policy: ANY - id: fnd-vdu - image: /var/lib/libvirt/images/fnd.qcow2 - name: fnd-vdu - vm-flavor: - memory-mb: '1024' - storage-gb: '4' - vcpu-count: '1' + vnfd:vnfd: + - vnfd:vendor: Keynetic Technologies + vnfd:version: '0.3' + vnfd:description: Keynetic Data Service + vnfd:id: fnd + vnfd:name: Keynetic-FND + vnfd:short-name: KNT-FND + vnfd:logo: keynetic.png + vnfd:service-function-chain: UNAWARE + vnfd:connection-point: + - vnfd:id: mgmt + vnfd:name: mgmt + vnfd:type: VPORT + - vnfd:id: data + vnfd:name: data + vnfd:type: VPORT + vnfd:vdu: + - vnfd:description: FND VDU + vnfd:external-interface: + - vnfd:name: eth0 + vnfd:virtual-interface: + vnfd:type: OM-MGMT + vnfd:vnfd-connection-point-ref: mgmt + - vnfd:name: data + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: data + vnfd:guest-epa: + vnfd:cpu-pinning-policy: ANY + vnfd:id: fnd-vdu + vnfd:image: /var/lib/libvirt/images/fnd.img + vnfd:name: fnd-vdu + vnfd:vm-flavor: + vnfd:memory-mb: '1024' + vnfd:storage-gb: '4' + vnfd:vcpu-count: '1' diff --git a/src/vnfd/knt_fne_vnf/knt_fne__vnfd.yaml b/src/vnfd/knt_fne_vnf/knt_fne__vnfd.yaml index ba1818d..580b5b7 100755 --- a/src/vnfd/knt_fne_vnf/knt_fne__vnfd.yaml +++ b/src/vnfd/knt_fne_vnf/knt_fne__vnfd.yaml @@ -15,101 +15,60 @@ # # vnfd:vnfd-catalog: - vnfd: - - vendor: Keynetic Technologies - version: '0.3' - description: FlowNAC Enforcement - id: fne - name: Keynetic-FNE - short-name: KNT-FNE - logo: flownac.png - service-function-chain: UNAWARE - vnf-configuration: - config-attributes: - config-delay: 10 - service-primitive: - - name: config - parameter: - - name: ssh-hostname - data-type: STRING - mandatory: 'true' - default-value: - - name: ssh-username - data-type: STRING - mandatory: 'true' - default-value: flownac - - name: ssh-password - data-type: STRING - mandatory: 'true' - default-value: fnac@osm - - name: mode - data-type: STRING - read-only: 'true' - default-value: fne - - name: start - - name: stop - - name: restart - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: flownac - - name: ssh-password - value: fnac@osm - - name: mode - value: fne - seq: '1' - - name: start - seq: '2' - juju: - charm: flownac - connection-point: - - id: mgmt - name: mgmt - type: VPORT - - id: user - name: user - type: VPORT - - id: data - name: data - type: VPORT - - id: auth - name: auth - type: VPORT - - id: ctrl - name: ctrl - type: VPORT - vdu: - - description: FNE VDU - external-interface: - - name: eth0 - virtual-interface: - type: OM-MGMT - vnfd-connection-point-ref: mgmt - - name: user - virtual-interface: - type: VIRTIO - vnfd-connection-point-ref: user - - name: data - virtual-interface: - type: VIRTIO - vnfd-connection-point-ref: data - - name: auth - virtual-interface: - type: VIRTIO - vnfd-connection-point-ref: auth - - name: ctrl - virtual-interface: - type: VIRTIO - vnfd-connection-point-ref: ctrl - guest-epa: - cpu-pinning-policy: ANY - id: fne-vdu - image: /var/lib/libvirt/images/fne.qcow2 - name: fne-vdu - vm-flavor: - memory-mb: '1024' - storage-gb: '4' - vcpu-count: '1' + vnfd:vnfd: + - vnfd:vendor: Keynetic Technologies + vnfd:version: '0.3' + vnfd:description: FlowNAC Enforcement + vnfd:id: fne + vnfd:name: Keynetic-FNE + vnfd:short-name: KNT-FNE + vnfd:logo: flownac.png + vnfd:service-function-chain: UNAWARE + vnfd:connection-point: + - vnfd:id: mgmt + vnfd:name: mgmt + vnfd:type: VPORT + - vnfd:id: user + vnfd:name: user + vnfd:type: VPORT + - vnfd:id: data + vnfd:name: data + vnfd:type: VPORT + - vnfd:id: auth + vnfd:name: auth + vnfd:type: VPORT + - vnfd:id: ctrl + vnfd:name: ctrl + vnfd:type: VPORT + vnfd:vdu: + - vnfd:description: FNE VDU + vnfd:external-interface: + - vnfd:name: eth0 + vnfd:virtual-interface: + vnfd:type: OM-MGMT + vnfd:vnfd-connection-point-ref: mgmt + - vnfd:name: user + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: user + - vnfd:name: data + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: data + - vnfd:name: auth + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: auth + - vnfd:name: ctrl + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: ctrl + vnfd:guest-epa: + vnfd:cpu-pinning-policy: ANY + vnfd:id: fne-vdu + vnfd:image: /var/lib/libvirt/images/fne.img + vnfd:name: fne-vdu + vnfd:vm-flavor: + vnfd:memory-mb: '1024' + vnfd:storage-gb: '4' + vnfd:vcpu-count: '1' diff --git a/src/vnfd/knt_fnu_vnf/knt_fnu__vnfd.yaml b/src/vnfd/knt_fnu_vnf/knt_fnu__vnfd.yaml index 2d731af..863fa34 100755 --- a/src/vnfd/knt_fnu_vnf/knt_fnu__vnfd.yaml +++ b/src/vnfd/knt_fnu_vnf/knt_fnu__vnfd.yaml @@ -15,90 +15,39 @@ # # vnfd:vnfd-catalog: - vnfd: - - vendor: Keynetic Technologies - version: '0.3' - description: Keynetic User - id: fnu - name: Keynetic-FNU - short-name: KNT-FNU - logo: keynetic.png - service-function-chain: UNAWARE - vnf-configuration: - config-attributes: - config-delay: 10 - service-primitive: - - name: config - parameter: - - name: ssh-hostname - data-type: STRING - mandatory: 'true' - default-value: - - name: ssh-username - data-type: STRING - mandatory: 'true' - default-value: flownac - - name: ssh-password - data-type: STRING - mandatory: 'true' - default-value: fnac@osm - - name: mode - data-type: STRING - read-only: 'true' - default-value: fnu - - name: start - - name: stop - - name: restart - - name: check-serv - parameter: - - name: service-host - data-type: STRING - mandatory: 'false' - default-value: 10.100.101.102 - - name: start-client - parameter: - - name: service - data-type: STRING - mandatory: 'false' - default-value: iperf - initial-config-primitive: - - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: flownac - - name: ssh-password - value: fnac@osm - - name: mode - value: fnu - seq: '1' - juju: - charm: flownac - connection-point: - - id: mgmt - name: mgmt - type: VPORT - - id: user - name: user - type: VPORT - vdu: - - description: FNU VDU - external-interface: - - name: eth0 - virtual-interface: - type: OM-MGMT - vnfd-connection-point-ref: mgmt - - name: user - virtual-interface: - type: VIRTIO - vnfd-connection-point-ref: user - guest-epa: - cpu-pinning-policy: ANY - id: fnu-vdu - image: /var/lib/libvirt/images/fnu.qcow2 - name: fnu-vdu - vm-flavor: - memory-mb: '1024' - storage-gb: '4' - vcpu-count: '1' + vnfd:vnfd: + - vnfd:vendor: Keynetic Technologies + vnfd:version: '0.3' + vnfd:description: Keynetic User + vnfd:id: fnu + vnfd:name: Keynetic-FNU + vnfd:short-name: KNT-FNU + vnfd:logo: keynetic.png + vnfd:service-function-chain: UNAWARE + vnfd:connection-point: + - vnfd:id: mgmt + vnfd:name: mgmt + vnfd:type: VPORT + - vnfd:id: user + vnfd:name: user + vnfd:type: VPORT + vnfd:vdu: + - vnfd:description: FNU VDU + vnfd:external-interface: + - vnfd:name: eth0 + vnfd:virtual-interface: + vnfd:type: OM-MGMT + vnfd:vnfd-connection-point-ref: mgmt + - vnfd:name: user + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: user + vnfd:guest-epa: + vnfd:cpu-pinning-policy: ANY + vnfd:id: fnu-vdu + vnfd:image: /var/lib/libvirt/images/fnu.img + vnfd:name: fnu-vdu + vnfd:vm-flavor: + vnfd:memory-mb: '1024' + vnfd:storage-gb: '4' + vnfd:vcpu-count: '1'