Updated FlowNAC NS / FlowNAC NS including test user&service

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

diff --git a/Makefile b/Makefile
index 6cf2d76..511a74a 100644 (file)
--- 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 knt_flownac_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 knt_flownac-us_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 knt_fnc_vnf knt_fne_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 knt_fnu_vnf knt_fnd_vnf
 VNFD_SRC_DIR := src/vnfd
 VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd
 

diff --git a/src/nsd/knt_flownac-us_ns/icons/flownac.png b/src/nsd/knt_flownac-us_ns/icons/flownac.png
new file mode 100755 (executable)
index 0000000..261ed8e
Binary files /dev/null and b/src/nsd/knt_flownac-us_ns/icons/flownac.png differ

diff --git a/src/nsd/knt_flownac-us_ns/knt_flownac-us_nsd.yaml b/src/nsd/knt_flownac-us_ns/knt_flownac-us_nsd.yaml
new file mode 100755 (executable)
index 0000000..54cfa2d
--- /dev/null
+++ b/src/nsd/knt_flownac-us_ns/knt_flownac-us_nsd.yaml
@@ -0,0 +1,121 @@
+#
+#   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.3'
+        nsd:description: Flow-based Network Access Control
+        nsd:id: flownac-us
+        nsd:name: Keynetic-FlowNAC-US
+        nsd:short-name: KNT-FNAC-US
+        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: fnc
+        -   nsd:member-vnf-index: '2'
+            nsd:start-by-default: 'true'
+            nsd:vnfd-id-ref: fne
+        -   nsd:member-vnf-index: '3'
+            nsd:start-by-default: 'true'
+            nsd:vnfd-id-ref: fnu
+        -   nsd:member-vnf-index: '4'
+            nsd:start-by-default: 'true'
+            nsd:vnfd-id-ref: fnd
+        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: fnc
+            -   nsd:member-vnf-index-ref: '2'
+                nsd:vnfd-connection-point-ref: mgmt
+                nsd:vnfd-id-ref: fne
+            -   nsd:member-vnf-index-ref: '3'
+                nsd:vnfd-connection-point-ref: mgmt
+                nsd:vnfd-id-ref: fnu
+            -   nsd:member-vnf-index-ref: '4'
+                nsd:vnfd-connection-point-ref: mgmt
+                nsd:vnfd-id-ref: fnd
+        -   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: fne
+            -   nsd:member-vnf-index-ref: '3'
+                nsd:vnfd-connection-point-ref: user
+                nsd:vnfd-id-ref: fnu
+        -   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: fne
+            -   nsd:member-vnf-index-ref: '4'
+                nsd:vnfd-connection-point-ref: data
+                nsd:vnfd-id-ref: fnd
+        -   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: fnc
+            -   nsd:member-vnf-index-ref: '2'
+                nsd:vnfd-connection-point-ref: auth
+                nsd:vnfd-id-ref: fne
+        -   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: fnc
+            -   nsd:member-vnf-index-ref: '2'
+                nsd:vnfd-connection-point-ref: ctrl
+                nsd:vnfd-id-ref: fne

diff --git a/src/nsd/knt_flownac_ns/knt_flownac_nsd.yaml b/src/nsd/knt_flownac_ns/knt_flownac_nsd.yaml
index b7e9e2d..a4b50f5 100755 (executable)
--- a/src/nsd/knt_flownac_ns/knt_flownac_nsd.yaml
+++ b/src/nsd/knt_flownac_ns/knt_flownac_nsd.yaml
@@ -17,7 +17,7 @@
 nsd:nsd-catalog:
     nsd:nsd:
     -   nsd:vendor: Keynetic Technologies
-        nsd:version: '0.2'
+        nsd:version: '0.3'
         nsd:description: Flow-based Network Access Control
         nsd:id: flownac
         nsd:name: Keynetic-FlowNAC
@@ -27,10 +27,10 @@ nsd:nsd-catalog:
         nsd:constituent-vnfd:
         -   nsd:member-vnf-index: '1'
             nsd:start-by-default: 'true'
-            nsd:vnfd-id-ref: fnc0.1
+            nsd:vnfd-id-ref: fnc
         -   nsd:member-vnf-index: '2'
             nsd:start-by-default: 'true'
-            nsd:vnfd-id-ref: fne0.1
+            nsd:vnfd-id-ref: fne
         nsd:vld:
         -   nsd:description: Management Link
             nsd:id: mgmt
@@ -43,10 +43,10 @@ nsd:nsd-catalog:
             nsd:vnfd-connection-point-ref:
             -   nsd:member-vnf-index-ref: '1'
                 nsd:vnfd-connection-point-ref: mgmt
-                nsd:vnfd-id-ref: fnc0.1
+                nsd:vnfd-id-ref: fnc
             -   nsd:member-vnf-index-ref: '2'
                 nsd:vnfd-connection-point-ref: mgmt
-                nsd:vnfd-id-ref: fne0.1
+                nsd:vnfd-id-ref: fne
         -   nsd:description: User Link
             nsd:id: user
             nsd:name: user
@@ -58,7 +58,7 @@ nsd:nsd-catalog:
             nsd:vnfd-connection-point-ref:
             -   nsd:member-vnf-index-ref: '2'
                 nsd:vnfd-connection-point-ref: user
-                nsd:vnfd-id-ref: fne0.1
+                nsd:vnfd-id-ref: fne
         -   nsd:description: Service Link
             nsd:id: data
             nsd:name: service
@@ -70,7 +70,7 @@ nsd:nsd-catalog:
             nsd:vnfd-connection-point-ref:
             -   nsd:member-vnf-index-ref: '2'
                 nsd:vnfd-connection-point-ref: data
-                nsd:vnfd-id-ref: fne0.1
+                nsd:vnfd-id-ref: fne
         -   nsd:description: Auth Link
             nsd:id: auth
             nsd:name: auth
@@ -82,10 +82,10 @@ nsd:nsd-catalog:
             nsd:vnfd-connection-point-ref:
             -   nsd:member-vnf-index-ref: '1'
                 nsd:vnfd-connection-point-ref: auth
-                nsd:vnfd-id-ref: fnc0.1
+                nsd:vnfd-id-ref: fnc
             -   nsd:member-vnf-index-ref: '2'
                 nsd:vnfd-connection-point-ref: auth
-                nsd:vnfd-id-ref: fne0.1
+                nsd:vnfd-id-ref: fne
         -   nsd:description: Control Link
             nsd:id: ctrl
             nsd:name: ctrl
@@ -97,7 +97,7 @@ nsd:nsd-catalog:
             nsd:vnfd-connection-point-ref:
             -   nsd:member-vnf-index-ref: '1'
                 nsd:vnfd-connection-point-ref: ctrl
-                nsd:vnfd-id-ref: fnc0.1
+                nsd:vnfd-id-ref: fnc
             -   nsd:member-vnf-index-ref: '2'
                 nsd:vnfd-connection-point-ref: ctrl
-                nsd:vnfd-id-ref: fne0.1
+                nsd:vnfd-id-ref: fne

diff --git a/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml b/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml
index e1e3e67..b93c74a 100755 (executable)
--- a/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml
+++ b/src/vnfd/knt_fnc_vnf/knt_fnc__vnfd.yaml
@@ -17,9 +17,9 @@
 vnfd:vnfd-catalog:
     vnfd:vnfd:
     -   vnfd:vendor: Keynetic Technologies
-        vnfd:version: '0.2'
+        vnfd:version: '0.3'
         vnfd:description: FlowNAC Control
-        vnfd:id: fnc0.1
+        vnfd:id: fnc
         vnfd:name: Keynetic-FNC
         vnfd:short-name: KNT-FNC
         vnfd:logo: flownac.png

diff --git a/src/vnfd/knt_fnd_vnf/icons/keynetic.png b/src/vnfd/knt_fnd_vnf/icons/keynetic.png
new file mode 100644 (file)
index 0000000..26ed506
Binary files /dev/null and b/src/vnfd/knt_fnd_vnf/icons/keynetic.png differ

diff --git a/src/vnfd/knt_fnd_vnf/knt_fnd__vnfd.yaml b/src/vnfd/knt_fnd_vnf/knt_fnd__vnfd.yaml
new file mode 100755 (executable)
index 0000000..7aac7aa
--- /dev/null
+++ b/src/vnfd/knt_fnd_vnf/knt_fnd__vnfd.yaml
@@ -0,0 +1,53 @@
+#
+#   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.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 a4f6bbf..580b5b7 100755 (executable)
--- a/src/vnfd/knt_fne_vnf/knt_fne__vnfd.yaml
+++ b/src/vnfd/knt_fne_vnf/knt_fne__vnfd.yaml
@@ -17,9 +17,9 @@
 vnfd:vnfd-catalog:
     vnfd:vnfd:
     -   vnfd:vendor: Keynetic Technologies
-        vnfd:version: '0.2'
+        vnfd:version: '0.3'
         vnfd:description: FlowNAC Enforcement
-        vnfd:id: fne0.1
+        vnfd:id: fne
         vnfd:name: Keynetic-FNE
         vnfd:short-name: KNT-FNE
         vnfd:logo: flownac.png

diff --git a/src/vnfd/knt_fnu_vnf/icons/keynetic.png b/src/vnfd/knt_fnu_vnf/icons/keynetic.png
new file mode 100644 (file)
index 0000000..26ed506
Binary files /dev/null and b/src/vnfd/knt_fnu_vnf/icons/keynetic.png differ

diff --git a/src/vnfd/knt_fnu_vnf/knt_fnu__vnfd.yaml b/src/vnfd/knt_fnu_vnf/knt_fnu__vnfd.yaml
new file mode 100755 (executable)
index 0000000..863fa34
--- /dev/null
+++ b/src/vnfd/knt_fnu_vnf/knt_fnu__vnfd.yaml
@@ -0,0 +1,53 @@
+#
+#   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.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'