Skip to content
Snippets Groups Projects
Commit 61ee8eb5 authored by Mark Beierl's avatar Mark Beierl
Browse files

Merge branch 'sol006' into 'master' 

Sol006 merge

See merge request !106
parents 17583c8b 02ef75b6
No related branches found
No related tags found
1 merge request!106Sol006 merge
Pipeline #142 passed with stage
in 1 minute and 56 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1162 additions and 1065 deletions
hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml
+ 21
− 15
View file @ 61ee8eb5
vnfd-catalog: vnfd:
vnfd: df:
- id: hackfest-simple-k8s-vnf - id: default-df
name: hackfest-simple-k8s-vnf kdu-profile:
connection-point: - kdu-model-id: mykdu-model
- name: mgmtnet name: mykdu
mgmt-interface: ext-cpd:
cp: mgmt - id: mgmt-ext
kdu: k8s-cluster-net: mgmtnet
- name: mykdu id: hackfest-simple-k8s-vnf
juju-bundle: cs:~dominik.f/bundle/hf-k8s-bundle-0 k8s-cluster:
k8s-cluster: nets:
nets: - id: mgmtnet
- id: mgmtnet kdu:
external-connection-point-ref: mgmt - name: mykdu
kdu-model:
- id: mykdu-model
kdu-model-locator: cs:~dominik.f/bundle/hf-k8s-bundle-0
kdu-model-type: juju-bundle
mgmt-cp: mgmt-ext
product-name: hackfest-simple-k8s-vnf
hackfest_vyos_ns/hackfest_vyos_nsd.yaml
+ 34
− 41
View file @ 61ee8eb5
nsd-catalog: nsd:
nsd: nsd:
- id: hackfest_vyos-ns - description: Simple NS with a single VyOS Router VNF
name: hackfest_vyos-ns df:
short-name: hackfest_vyos-ns - id: default-df
description: Simple NS with a single VyOS Router VNF vnf-profile:
version: '1.0' - id: '1'
logo: osm.png virtual-link-connectivity:
constituent-vnfd: - constituent-cpd-id:
- vnfd-id-ref: hackfest_vyos-vnf - constituent-base-element-id: '1'
member-vnf-index: '1' constituent-cpd-id: vnf-mgmt-ext
vld: ip-address: 172.21.250.200
- id: mgmtnet virtual-link-profile-id: mgmtnet
name: mgmtnet - constituent-cpd-id:
short-name: mgmtnet - constituent-base-element-id: '1'
type: ELAN constituent-cpd-id: vnf-internal-ext
mgmt-network: true virtual-link-profile-id: internal
vim-network-name: osm-ext - constituent-cpd-id:
vnfd-connection-point-ref: - constituent-base-element-id: '1'
- vnfd-id-ref: hackfest_vyos-vnf constituent-cpd-id: vnf-external-ext
member-vnf-index-ref: '1' virtual-link-profile-id: external
vnfd-connection-point-ref: vnf-mgmt vnfd-id: hackfest_vyos-vnf
ip-address: 172.21.250.200 id: hackfest_vyos-ns
- id: internal name: hackfest_vyos-ns
name: internal version: '1.0'
short-name: internal virtual-link-desc:
type: ELAN - id: mgmtnet
mgmt-network: true mgmt-network: true
vnfd-connection-point-ref: - id: internal
- vnfd-id-ref: hackfest_vyos-vnf mgmt-network: true
member-vnf-index-ref: '1' - id: external
vnfd-connection-point-ref: vnf-internal mgmt-network: true
- id: external vnfd-id:
name: external - hackfest_vyos-vnf
short-name: external
type: ELAN
mgmt-network: true
vnfd-connection-point-ref:
- vnfd-id-ref: hackfest_vyos-vnf
member-vnf-index-ref: '1'
vnfd-connection-point-ref: vnf-external
hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml
+ 71
− 50
View file @ 61ee8eb5
vnfd-catalog: vnfd:
vnfd: description: A basic virtual router
- id: hackfest_vyos-vnf df:
name: hackfest_vyos-vnf - id: default-df
short-name: hackfest_vyos-vnf instantiation-level:
version: '1.0' - id: default-instantiation-level
description: A basic virtual router vdu-level:
connection-point: - number-of-instances: 1
- name: vnf-mgmt vdu-id: vyos-VM
type: VPORT vdu-profile:
- name: vnf-internal - id: vyos-VM
type: VPORT min-number-of-instances: 1
port-security-enabled: false ext-cpd:
- name: vnf-external - id: vnf-mgmt-ext
type: VPORT int-cpd:
port-security-enabled: false cpd: vdu-eth0-int
vdu: vdu-id: vyos-VM
- id: vyos-VM - id: vnf-internal-ext
name: vyos-VM int-cpd:
cloud-init-file: vyos-userdata cpd: vdu-eth1-int
image: vyos-1.1.7 vdu-id: vyos-VM
count: 1 - id: vnf-external-ext
vm-flavor: int-cpd:
vcpu-count: 1 cpd: vdu-eth2-int
memory-mb: 2048 vdu-id: vyos-VM
storage-gb: 10 id: hackfest_vyos-vnf
interface: mgmt-cp: vnf-mgmt-ext
- name: vdu-eth0 product-name: hackfest_vyos-vnf
type: EXTERNAL sw-image-desc:
position: 0 - id: vyos-1.1.7
virtual-interface: image: vyos-1.1.7
type: PARAVIRT name: vyos-1.1.7
external-connection-point-ref: vnf-mgmt vdu:
- name: vdu-eth1 - cloud-init-file: vyos-userdata
type: EXTERNAL id: vyos-VM
position: 1 int-cpd:
virtual-interface: - id: vdu-eth0-int
type: PARAVIRT virtual-network-interface-requirement:
external-connection-point-ref: vnf-internal - name: vdu-eth0
- name: vdu-eth2 position: 0
type: EXTERNAL virtual-interface:
position: 2 type: PARAVIRT
virtual-interface: - id: vdu-eth1-int
type: PARAVIRT virtual-network-interface-requirement:
external-connection-point-ref: vnf-external - name: vdu-eth1
supplemental-boot-data: position: 1
boot-data-drive: true virtual-interface:
mgmt-interface: type: PARAVIRT
cp: vnf-mgmt - id: vdu-eth2-int
virtual-network-interface-requirement:
- name: vdu-eth2
position: 2
virtual-interface:
type: PARAVIRT
name: vyos-VM
supplemental-boot-data:
boot-data-drive: true
sw-image-desc: vyos-1.1.7
virtual-compute-desc: vyos-VM-compute
virtual-storage-desc:
- vyos-VM-storage
version: '1.0'
virtual-compute-desc:
- id: vyos-VM-compute
virtual-cpu:
num-virtual-cpu: 1
virtual-memory:
size: 2.0
virtual-storage-desc:
- id: vyos-VM-storage
size-of-storage: 10
k8s_juju_ns/k8s_juju_nsd.yaml
+ 52
− 43
View file @ 61ee8eb5
nsd-catalog: nsd:
nsd: nsd:
- id: k8s_juju - description: NS consisting of a 4 k8s_jujumachine VNFs and 1 k8s_jujucontroller
name: k8s_juju VNF connected to mgmt network
short-name: k8s_juju designer: OSM
description: NS consisting of a 4 k8s_jujumachine VNFs and 1 k8s_jujucontroller VNF connected to mgmt network df:
vendor: OSM - id: default-df
version: '1.0' vnf-profile:
logo: osm.png - id: k8s_vnf1
constituent-vnfd: virtual-link-connectivity:
- member-vnf-index: k8s_vnf1 - constituent-cpd-id:
vnfd-id-ref: k8s_jujumachine_vnf - constituent-base-element-id: k8s_vnf1
- member-vnf-index: k8s_vnf2 constituent-cpd-id: mgmt-ext
vnfd-id-ref: k8s_jujumachine_vnf virtual-link-profile-id: mgmtnet
- member-vnf-index: k8s_vnf3 vnfd-id: k8s_jujumachine_vnf
vnfd-id-ref: k8s_jujumachine_vnf - id: k8s_vnf2
- member-vnf-index: k8s_vnf4 virtual-link-connectivity:
vnfd-id-ref: k8s_jujumachine_vnf - constituent-cpd-id:
- member-vnf-index: k8s_juju - constituent-base-element-id: k8s_vnf2
vnfd-id-ref: k8s_jujucontroller_vnf constituent-cpd-id: mgmt-ext
vld: virtual-link-profile-id: mgmtnet
- id: mgmtnet vnfd-id: k8s_jujumachine_vnf
name: mgmtnet - id: k8s_vnf3
type: ELAN virtual-link-connectivity:
mgmt-network: 'true' - constituent-cpd-id:
vim-network-name: mgmt - constituent-base-element-id: k8s_vnf3
vnfd-connection-point-ref: constituent-cpd-id: mgmt-ext
- member-vnf-index-ref: k8s_vnf1 virtual-link-profile-id: mgmtnet
vnfd-id-ref: k8s_jujumachine_vnf vnfd-id: k8s_jujumachine_vnf
vnfd-connection-point-ref: mgmt - id: k8s_vnf4
- member-vnf-index-ref: k8s_vnf2 virtual-link-connectivity:
vnfd-id-ref: k8s_jujumachine_vnf - constituent-cpd-id:
vnfd-connection-point-ref: mgmt - constituent-base-element-id: k8s_vnf4
- member-vnf-index-ref: k8s_vnf3 constituent-cpd-id: mgmt-ext
vnfd-id-ref: k8s_jujumachine_vnf virtual-link-profile-id: mgmtnet
vnfd-connection-point-ref: mgmt vnfd-id: k8s_jujumachine_vnf
- member-vnf-index-ref: k8s_vnf4 - id: k8s_juju
vnfd-id-ref: k8s_jujumachine_vnf virtual-link-connectivity:
vnfd-connection-point-ref: mgmt - constituent-cpd-id:
- member-vnf-index-ref: k8s_juju - constituent-base-element-id: k8s_juju
vnfd-id-ref: k8s_jujucontroller_vnf constituent-cpd-id: mgmt-ext
vnfd-connection-point-ref: mgmt virtual-link-profile-id: mgmtnet
vnfd-id: k8s_jujucontroller_vnf
id: k8s_juju
name: k8s_juju
version: '1.0'
virtual-link-desc:
- id: mgmtnet
mgmt-network: 'true'
vnfd-id:
- k8s_jujumachine_vnf
- k8s_jujucontroller_vnf
k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml
+ 190
− 173
View file @ 61ee8eb5
vnfd-catalog: vnfd:
vnfd: description: A VNF consisting of 1 VDU for juju to deploy K8s cluster
- id: k8s_jujucontroller_vnf df:
name: k8s_jujucontroller_vnf - id: default-df
short-name: k8s_jujucontroller_vnf instantiation-level:
version: 1.0 - id: default-instantiation-level
description: A VNF consisting of 1 VDU for juju to deploy K8s cluster vdu-level:
logo: osm.png - number-of-instances: 1
connection-point: vdu-id: k8svm
- id: mgmt vdu-profile:
name: mgmt - id: k8svm
short-name: mgmt min-number-of-instances: 1
mgmt-interface: vnf-configuration-id: default-vnf-configuration
cp: mgmt ext-cpd:
vdu: - id: mgmt-ext
- id: k8svm int-cpd:
name: k8svm cpd: eth0-int
image: ubuntu18.04 vdu-id: k8svm
count: 1 id: k8s_jujucontroller_vnf
vm-flavor: mgmt-cp: mgmt-ext
vcpu-count: 2 product-name: k8s_jujucontroller_vnf
memory-mb: 4096 sw-image-desc:
storage-gb: 80 - id: ubuntu18.04
interface: image: ubuntu18.04
- name: eth0 name: ubuntu18.04
position: 1 vdu:
type: EXTERNAL - cloud-init-file: cloud-config.txt
virtual-interface: id: k8svm
type: PARAVIRT int-cpd:
external-connection-point-ref: mgmt - id: eth0-int
cloud-init-file: cloud-config.txt virtual-network-interface-requirement:
vnf-configuration: - name: eth0
config-access: position: 1
ssh-access: virtual-interface:
required: True type: PARAVIRT
default-user: ubuntu name: k8svm
juju: sw-image-desc: ubuntu18.04
charm: tid-jujuk8s virtual-compute-desc: k8svm-compute
initial-config-primitive: virtual-storage-desc:
- seq: '1' - k8svm-storage
name: config version: 1.0
parameter: virtual-compute-desc:
- name: ssh-hostname - id: k8svm-compute
value: <rw_mgmt_ip> virtual-cpu:
- name: ssh-username num-virtual-cpu: 2
value: ubuntu virtual-memory:
- seq: '2' size: 4.0
name: setup-juju virtual-storage-desc:
- seq: '3' - id: k8svm-storage
name: add-machines size-of-storage: 80
parameter: vnf-configuration:
- name: machine1 - config-access:
value: <MACHINE1> ssh-access:
- name: machine2 default-user: ubuntu
value: <MACHINE2> required: true
- name: machine3 config-primitive:
value: <MACHINE3> - name: setup-juju
- name: machine4 - name: deploy-bundle
value: <MACHINE4> parameter:
- name: machine5 - data-type: STRING
value: <MACHINE5> name: bundle
- name: machine6 - name: undeploy-bundle
value: <MACHINE6> - name: remove-machines
- name: machine7 - name: init-helm
value: <MACHINE7> - name: install-openebs-chart
- name: machine8 - name: install-openebs-kubectl
value: <MACHINE8> - name: post-deploy
- name: machine9 - name: add-machine
value: <MACHINE9> parameter:
- name: machine10 - data-type: STRING
value: <MACHINE10> name: machine
- seq: '4' - name: add-machines
name: deploy-bundle parameter:
parameter: - data-type: STRING
- name: bundle name: machine1
value: <BUNDLE> - data-type: STRING
- seq: '5' name: machine2
name: post-deploy - data-type: STRING
- seq: '6' name: machine3
name: install-openebs-kubectl - data-type: STRING
# - seq: '7' name: machine4
# name: init-helm - data-type: STRING
config-primitive: name: machine5
- name: setup-juju - data-type: STRING
- name: deploy-bundle name: machine6
parameter: - data-type: STRING
- name: bundle name: machine7
data-type: STRING - data-type: STRING
- name: undeploy-bundle name: machine8
- name: remove-machines - data-type: STRING
- name: init-helm name: machine9
- name: install-openebs-chart - data-type: STRING
- name: install-openebs-kubectl name: machine10
- name: post-deploy - name: remove-machines
- name: add-machine parameter:
parameter: - data-type: STRING
- name: machine name: force
data-type: STRING - name: add-repo
- name: add-machines parameter:
parameter: - data-type: STRING
- name: machine1 name: name
data-type: STRING - data-type: STRING
- name: machine2 name: url
data-type: STRING - name: remove-repo
- name: machine3 parameter:
data-type: STRING - data-type: STRING
- name: machine4 name: name
data-type: STRING - name: install-chart
- name: machine5 parameter:
data-type: STRING - data-type: STRING
- name: machine6 name: chart
data-type: STRING - data-type: STRING
- name: machine7 name: name
data-type: STRING - data-type: STRING
- name: machine8 name: namespace
data-type: STRING - data-type: STRING
- name: machine9 name: atomic
data-type: STRING - data-type: STRING
- name: machine10 name: values
data-type: STRING - data-type: STRING
- name: remove-machines name: valuesFile
parameter: - name: upgrade-release
- name: force parameter:
data-type: STRING - data-type: STRING
- name: add-repo name: chart
parameter: - data-type: STRING
- name: name name: name
data-type: STRING - data-type: STRING
- name: url name: namespace
data-type: STRING - data-type: STRING
- name: remove-repo name: atomic
parameter: - data-type: STRING
- name: name name: values
data-type: STRING - data-type: STRING
- name: install-chart name: valuesFile
parameter: - name: rollback-release
- name: chart parameter:
data-type: STRING - data-type: STRING
- name: name name: name
data-type: STRING - data-type: STRING
- name: namespace name: revision
data-type: STRING - name: delete-release
- name: atomic parameter:
data-type: STRING - data-type: STRING
- name: values name: name
data-type: STRING id: default-vnf-configuration
- name: valuesFile initial-config-primitive:
data-type: STRING - name: config
- name: upgrade-release parameter:
parameter: - name: ssh-hostname
- name: chart value: <rw_mgmt_ip>
data-type: STRING - name: ssh-username
- name: name value: ubuntu
data-type: STRING seq: '1'
- name: namespace - name: setup-juju
data-type: STRING seq: '2'
- name: atomic - name: add-machines
data-type: STRING parameter:
- name: values - name: machine1
data-type: STRING value: <MACHINE1>
- name: valuesFile - name: machine2
data-type: STRING value: <MACHINE2>
- name: rollback-release - name: machine3
parameter: value: <MACHINE3>
- name: name - name: machine4
data-type: STRING value: <MACHINE4>
- name: revision - name: machine5
data-type: STRING value: <MACHINE5>
- name: delete-release - name: machine6
parameter: value: <MACHINE6>
- name: name - name: machine7
data-type: STRING value: <MACHINE7>
- name: machine8
value: <MACHINE8>
- name: machine9
value: <MACHINE9>
- name: machine10
value: <MACHINE10>
seq: '3'
- name: deploy-bundle
parameter:
- name: bundle
value: <BUNDLE>
seq: '4'
- name: post-deploy
seq: '5'
- name: install-openebs-kubectl
seq: '6'
juju:
charm: tid-jujuk8s
k8s_jujumachine_vnf/k8s_jujumachine_vnfd.yaml
+ 49
− 32
View file @ 61ee8eb5
This diff is collapsed.
magma/fb_magma_knf/fb_magma_vnfd.yaml
+ 24
− 20
View file @ 61ee8eb5
vnfd-catalog: vnfd:
schema-version: '3.0' description: KNF with KDU using a helm-chart for Facebook magma orc8r
vnfd: df:
- id: fb_magma_knf - id: default-df
name: fb_magma_knf kdu-profile:
short-name: fb_magma_knf - kdu-model-id: orc8r-model
description: KNF with KDU using a helm-chart for Facebook magma orc8r name: orc8r
vendor: ATOS ext-cpd:
version: '1.0' - id: mgmt-ext
mgmt-interface: k8s-cluster-net: mgmtnet
cp: mgmt id: fb_magma_knf
connection-point: k8s-cluster:
- name: mgmt nets:
k8s-cluster: - id: mgmtnet
nets: kdu:
- id: mgmtnet - name: orc8r
external-connection-point-ref: mgmt kdu-model:
kdu: - id: orc8r-model
- name: orc8r kdu-model-locator: magma/orc8r
helm-chart: magma/orc8r kdu-model-type: helm-chart
\ No newline at end of file mgmt-cp: mgmt-ext
product-name: fb_magma_knf
provider: ATOS
version: '1.0'
magma/fb_magma_ns/fb_magma_nsd.yaml
+ 22
− 24
View file @ 61ee8eb5
This diff is collapsed.
magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml
+ 54
− 39
View file @ 61ee8eb5
This diff is collapsed.
magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml
+ 42
− 47
View file @ 61ee8eb5
This diff is collapsed.
magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml
+ 269
− 271
View file @ 61ee8eb5
This diff is collapsed.
magma/pdu.yaml
+ 0
− 1
View file @ 61ee8eb5
...@@ -6,7 +6,6 @@ shared: false ...@@ -6,7 +6,6 @@ shared: false
interfaces: interfaces:
- name: eth0 - name: eth0
ip-address: 172.21.250.200 ip-address: 172.21.250.200
vim-network-name: osm-ext
mgmt: true mgmt: true
- name: eth1 - name: eth1
ip-address: 192.168.239.7 ip-address: 192.168.239.7
......
magma/squid_cnf/squid_vnfd.yaml
+ 44
− 39
View file @ 61ee8eb5
This diff is collapsed.
magma/squid_cnf_ns/squid_cnf_nsd.yaml
+ 23
− 23
View file @ 61ee8eb5
This diff is collapsed.
nscharm_ns/nscharm_nsd.yaml
+ 52
− 50
View file @ 61ee8eb5
This diff is collapsed.
nscharm_policy_vnf/nscharm_policy_vnfd.yaml
+ 74
− 68
View file @ 61ee8eb5
This diff is collapsed.
nscharm_user_vnf/nscharm_user_vnfd.yaml
+ 74
− 64
View file @ 61ee8eb5
This diff is collapsed.
openldap_knf/openldap_vnfd.yaml
+ 24
− 21
View file @ 61ee8eb5
This diff is collapsed.
openldap_ns/openldap_nsd.yaml
+ 22
− 22
View file @ 61ee8eb5
This diff is collapsed.
simple_ee_ns/simple_ee_nsd.yaml
+ 21
− 22
View file @ 61ee8eb5
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment