projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ro-k8s charm to include commonkey
[osm/devops.git]
/
descriptor-packages
/
vnfd
/
ims_allin1_2p_vnf
/
src
/
IMS-ALLIN1__vnfd.yaml
diff --git
a/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
b/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
index
b73e110
..
27b2247
100644
(file)
--- a/
descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
+++ b/
descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
@@
-1,4
+1,4
@@
-vnfd
:vnfd
-catalog:
+vnfd-catalog:
vnfd:
- id: IMS-ALLIN1_2p
name: IMS-ALLIN1_2p
vnfd:
- id: IMS-ALLIN1_2p
name: IMS-ALLIN1_2p
@@
-6,12
+6,9
@@
vnfd:vnfd-catalog:
description: IMS-ALLIN1_2p
logo: metaswitch_2x.png
mgmt-interface:
description: IMS-ALLIN1_2p
logo: metaswitch_2x.png
mgmt-interface:
- vdu-id: IMS-ALLIN1_2p-VM
+ cp: eth1
vnf-configuration:
vnf-configuration:
- config-attributes:
- config-delay: '0'
- config-priority: '1'
- service-primitive:
+ config-primitive:
- name: config
parameter:
- name: home_domain
- name: config
parameter:
- name: home_domain
@@
-19,7
+16,7
@@
vnfd:vnfd-catalog:
mandatory: 'true'
default-value: ims.com
- name: password
mandatory: 'true'
default-value: ims.com
- name: password
- data-type:
string
+ data-type:
STRING
mandatory: 'true'
default-value: cw-aio
- name: create-update-user
mandatory: 'true'
default-value: cw-aio
- name: create-update-user
@@
-45,9
+42,9
@@
vnfd:vnfd-catalog:
charm: clearwater-aio-proxy
connection-point:
- name: eth0
charm: clearwater-aio-proxy
connection-point:
- name: eth0
- type: VPORT
+
- name: eth1
- name: eth1
- type: VPORT
+
vdu:
- id: IMS-ALLIN1_2p-VM
name: IMS-ALLIN1_2p-VM
vdu:
- id: IMS-ALLIN1_2p-VM
name: IMS-ALLIN1_2p-VM
@@
-58,19
+55,21
@@
vnfd:vnfd-catalog:
storage-gb: '10'
vcpu-count: '2'
mgmt-vpci: 0000:00:0a.0
storage-gb: '10'
vcpu-count: '2'
mgmt-vpci: 0000:00:0a.0
-
external-
interface:
+ interface:
- name: eth0
- name: eth0
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
virtual-interface:
bandwidth: '0'
- type:
VIRTIO
+ type:
PARAVIRT
vpci: 0000:00:0a.0
vpci: 0000:00:0a.0
-
vnfd
-connection-point-ref: eth0
+
external
-connection-point-ref: eth0
- name: eth1
- name: eth1
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
virtual-interface:
bandwidth: '0'
- type:
OM-MGM
T
+ type:
PARAVIR
T
vpci: 0000:00:0b.0
vpci: 0000:00:0b.0
-
vnfd
-connection-point-ref: eth1
+
external
-connection-point-ref: eth1
guest-epa:
cpu-pinning-policy: DEDICATED
cpu-thread-pinning-policy: PREFER
guest-epa:
cpu-pinning-policy: DEDICATED
cpu-thread-pinning-policy: PREFER