From: Jokin Garay <jokin.garay@keynetic.es>
Date: Wed, 16 Nov 2016 11:47:08 +0000 (+0100)
Subject: Keynetic FlowNAC NSD/VNFD
X-Git-Tag: v1.1.0~14
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F679%2F2;p=osm%2Fdescriptor-packages.git

Keynetic FlowNAC NSD/VNFD

Signed-off-by: Jokin Garay <jokin.garay@keynetic.es>
---

diff --git a/Makefile b/Makefile
index cf0f8cd..6cf2d76 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 #
 BUILD_DIR = build
 
-NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns cirros_ns cirros_2vnf_ns ubuntu_xenial_ns ping_pong_ns
+NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns cirros_ns cirros_2vnf_ns ubuntu_xenial_ns ping_pong_ns knt_flownac_ns
 NSD_SRC_DIR := src/nsd
 NSD_BUILD_DIR := $(BUILD_DIR)/nsd
 
@@ -27,7 +27,7 @@ NSD_BUILD_DIRS := $(addprefix $(NSD_BUILD_DIR)/, $(NSDS))
 NSD_PKGS := $(addsuffix .tar.gz, $(NSDS))
 NSD_BUILD_PKGS := $(addprefix $(NSD_BUILD_DIR)_pkgs/, $(NSD_PKGS))
 
-VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf VyOS_vnf cirros_vnf ubuntu_xenial_vnf ping_vnf pong_vnf
+VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf VyOS_vnf cirros_vnf ubuntu_xenial_vnf ping_vnf pong_vnf knt_fnc_vnf knt_fne_vnf
 VNFD_SRC_DIR := src/vnfd
 VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd
 
diff --git a/src/nsd/knt_flownac_ns/icons/flownac.png b/src/nsd/knt_flownac_ns/icons/flownac.png
new file mode 100755
index 0000000..261ed8e
Binary files /dev/null and b/src/nsd/knt_flownac_ns/icons/flownac.png differ
diff --git a/src/nsd/knt_flownac_ns/knt_flownac_nsd.yaml b/src/nsd/knt_flownac_ns/knt_flownac_nsd.yaml
new file mode 100755
index 0000000..b7e9e2d
--- /dev/null
+++ b/src/nsd/knt_flownac_ns/knt_flownac_nsd.yaml
@@ -0,0 +1,103 @@
+#
+#   Copyright 2016 Keynetic Technologies
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT 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:nsd-catalog:
+    nsd:nsd:
+    -   nsd:vendor: Keynetic Technologies
+        nsd:version: '0.2'
+        nsd:description: Flow-based Network Access Control
+        nsd:id: flownac
+        nsd:name: Keynetic-FlowNAC
+        nsd:short-name: KNT-FNAC
+        nsd:logo: flownac.png
+        nsd:meta: "{\"containerPositionMap\":{\"1\":{\"top\":180,\"left\":330,\"right\":580,\"bottom\":235,\"width\":250,\"height\":55},\"2\":{\"top\":405,\"left\":330,\"right\":580,\"bottom\":460,\"width\":250,\"height\":55},\"flownac\":{\"top\":30,\"left\":135,\"right\":385,\"bottom\":85,\"width\":250,\"height\":55},\"mgmt\":{\"top\":300,\"left\":825,\"right\":1075,\"bottom\":338,\"width\":250,\"height\":38},\"user\":{\"top\":540,\"left\":60,\"right\":310,\"bottom\":578,\"width\":250,\"height\":38},\"data\":{\"top\":540,\"left\":585,\"right\":835,\"bottom\":578,\"width\":250,\"height\":38},\"auth\":{\"top\":300,\"left\":195,\"right\":445,\"bottom\":338,\"width\":250,\"height\":38},\"ctrl\":{\"top\":300,\"left\":495,\"right\":745,\"bottom\":338,\"width\":250,\"height\":38}}}"
+        nsd:constituent-vnfd:
+        -   nsd:member-vnf-index: '1'
+            nsd:start-by-default: 'true'
+            nsd:vnfd-id-ref: fnc0.1
+        -   nsd:member-vnf-index: '2'
+            nsd:start-by-default: 'true'
+            nsd:vnfd-id-ref: fne0.1
+        nsd:vld:
+        -   nsd:description: Management Link
+            nsd:id: mgmt
+            nsd:name: mgmt
+            nsd:short-name: Management
+            nsd:type: ELAN
+            nsd:vim-network-name: mgmt-net
+            nsd:provider-network:
+                nsd:overlay-type: VLAN
+            nsd:vnfd-connection-point-ref:
+            -   nsd:member-vnf-index-ref: '1'
+                nsd:vnfd-connection-point-ref: mgmt
+                nsd:vnfd-id-ref: fnc0.1
+            -   nsd:member-vnf-index-ref: '2'
+                nsd:vnfd-connection-point-ref: mgmt
+                nsd:vnfd-id-ref: fne0.1
+        -   nsd:description: User Link
+            nsd:id: user
+            nsd:name: user
+            nsd:short-name: User
+            nsd:type: ELAN
+            nsd:vim-network-name: user-net
+            nsd:provider-network:
+                nsd:overlay-type: VLAN
+            nsd:vnfd-connection-point-ref:
+            -   nsd:member-vnf-index-ref: '2'
+                nsd:vnfd-connection-point-ref: user
+                nsd:vnfd-id-ref: fne0.1
+        -   nsd:description: Service Link
+            nsd:id: data
+            nsd:name: service
+            nsd:short-name: Service
+            nsd:type: ELAN
+            nsd:vim-network-name: data-net
+            nsd:provider-network:
+                nsd:overlay-type: VLAN
+            nsd:vnfd-connection-point-ref:
+            -   nsd:member-vnf-index-ref: '2'
+                nsd:vnfd-connection-point-ref: data
+                nsd:vnfd-id-ref: fne0.1
+        -   nsd:description: Auth Link
+            nsd:id: auth
+            nsd:name: auth
+            nsd:short-name: Auth
+            nsd:type: ELAN
+            nsd:vim-network-name: auth-net
+            nsd:provider-network:
+                nsd:overlay-type: VLAN
+            nsd:vnfd-connection-point-ref:
+            -   nsd:member-vnf-index-ref: '1'
+                nsd:vnfd-connection-point-ref: auth
+                nsd:vnfd-id-ref: fnc0.1
+            -   nsd:member-vnf-index-ref: '2'
+                nsd:vnfd-connection-point-ref: auth
+                nsd:vnfd-id-ref: fne0.1
+        -   nsd:description: Control Link
+            nsd:id: ctrl
+            nsd:name: ctrl
+            nsd:short-name: Control
+            nsd:type: ELAN
+            nsd:vim-network-name: ctrl-net
+            nsd:provider-network:
+                nsd:overlay-type: VLAN
+            nsd:vnfd-connection-point-ref:
+            -   nsd:member-vnf-index-ref: '1'
+                nsd:vnfd-connection-point-ref: ctrl
+                nsd:vnfd-id-ref: fnc0.1
+            -   nsd:member-vnf-index-ref: '2'
+                nsd:vnfd-connection-point-ref: ctrl
+                nsd:vnfd-id-ref: fne0.1
diff --git a/src/vnfd/knt_fnc_vnf/icons/flownac.png b/src/vnfd/knt_fnc_vnf/icons/flownac.png
new file mode 100755
index 0000000..261ed8e
Binary files /dev/null and b/src/vnfd/knt_fnc_vnf/icons/flownac.png differ
diff --git a/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml b/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml
new file mode 100755
index 0000000..e1e3e67
--- /dev/null
+++ b/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml
@@ -0,0 +1,60 @@
+#
+#   Copyright 2016 Keynetic Technologies
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+#
+vnfd:vnfd-catalog:
+    vnfd:vnfd:
+    -   vnfd:vendor: Keynetic Technologies
+        vnfd:version: '0.2'
+        vnfd:description: FlowNAC Control
+        vnfd:id: fnc0.1
+        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_fne_vnf/icons/flownac.png b/src/vnfd/knt_fne_vnf/icons/flownac.png
new file mode 100755
index 0000000..261ed8e
Binary files /dev/null and b/src/vnfd/knt_fne_vnf/icons/flownac.png differ
diff --git a/src/vnfd/knt_fne_vnf/knt_fne__vnfd.yaml b/src/vnfd/knt_fne_vnf/knt_fne__vnfd.yaml
new file mode 100755
index 0000000..a4f6bbf
--- /dev/null
+++ b/src/vnfd/knt_fne_vnf/knt_fne__vnfd.yaml
@@ -0,0 +1,74 @@
+#
+#   Copyright 2016 Keynetic Technologies
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+#
+vnfd:vnfd-catalog:
+    vnfd:vnfd:
+    -   vnfd:vendor: Keynetic Technologies
+        vnfd:version: '0.2'
+        vnfd:description: FlowNAC Enforcement
+        vnfd:id: fne0.1
+        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'