Merge "adding new kubernetes config"
diff --git a/kubernetes-configs/edgecore-pod1.yml b/kubernetes-configs/edgecore-pod1.yml
index a1d2494..347c988 100644
--- a/kubernetes-configs/edgecore-pod1.yml
+++ b/kubernetes-configs/edgecore-pod1.yml
@@ -1,3 +1,86 @@
---
-# SEBA Values
+# Create file to override the default helm charts values (call it extend.yaml)
+global:
+ registry: 192.168.99.181:30500/
+# CORD platform overrides
+kafka:
+ image: 192.168.99.181:30500/confluentinc/cp-kafka
+ imageTag: 4.1.2-2
+ configurationOverrides:
+ zookeeper.connection.timeout.ms: 60000
+ zookeeper.session.timeout.ms: 60000
+
+ zookeeper:
+ image:
+ repository: 192.168.99.181:30500/gcr.io/google_samples/k8szk
+
+logging:
+ elasticsearch:
+ image:
+ repository: 192.168.99.181:30500/docker.elastic.co/elasticsearch/elasticsearch-oss
+ initImage:
+ repository: 192.168.99.181:30500/busybox
+
+ kibana:
+ image:
+ repository: 192.168.99.181:30500/docker.elastic.co/kibana/kibana-oss
+
+ logstash:
+ image:
+ repository: 192.168.99.181:30500/docker.elastic.co/logstash/logstash-oss
+
+nem-monitoring:
+ grafana:
+ image:
+ repository: 192.168.99.181:30500/grafana/grafana
+ sidecar:
+ image: 192.168.99.181:30500/kiwigrid/k8s-sidecar:0.0.3
+
+ prometheus:
+ server:
+ image:
+ repository: 192.168.99.181:30500/prom/prometheus
+ alertmanager:
+ image:
+ repository: 192.168.99.181:30500/prom/alertmanager
+ configmapReload:
+ image:
+ repository: 192.168.99.181:30500/jimmidyson/configmap-reload
+ kubeStateMetrics:
+ image:
+ repository: 192.168.99.181:30500/quay.io/coreos/kube-state-metrics
+ nodeExporter:
+ image:
+ repository: 192.168.99.181:30500/prom/node-exporter
+ pushgateway:
+ image:
+ repository: 192.168.99.181:30500/prom/pushgateway
+ initChownData:
+ image:
+ repository: 192.168.99.181:30500/busybox
+
+# SEBA specific overrides
+voltha:
+ etcd-cluster:
+ spec:
+ repository: 192.168.99.181:30500/quay.io/coreos/etcd
+ pod:
+ busyboxImage: 192.168.99.181:30500/busybox:1.28.1-glibc
+
+ etcdOperator:
+ image:
+ repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
+ backupOperator:
+ image:
+ repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
+ restoreOperator:
+ image:
+ repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
+
+seba-services:
+ oltAppUrl: http://192.168.99.181:30160/olt.oar
+ sadisAppUrl: http://192.168.99.181:30160/sadis.oar
+ dhcpL2RelayAppUrl: http://192.168.99.181:30160/dhcpl2relay.oar
+ aaaAppUrl: http://192.168.99.181:30160/aaa.oar
+ kafkaAppUrl: http://192.168.99.181:30160/kafka.oar
diff --git a/kubernetes-configs/mcord-barcellona-remote-dt.conf b/kubernetes-configs/mcord-barcellona-remote-dt.conf
index 9479215..3fd9efe 100644
--- a/kubernetes-configs/mcord-barcellona-remote-dt.conf
+++ b/kubernetes-configs/mcord-barcellona-remote-dt.conf
@@ -15,5 +15,5 @@
users:
- name: kubernetes-admin
user:
- client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJZEdUNk1GMDFTbjR3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBeU1UTXlNVE16TWpCYUZ3MHlNREF5TVRNeU1UTTFNRGRhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXpFak9PcGtXQUFFVUJEak0KLzFRNElJbE5wVVVJOWwvcCtha2VsUHRWamhZZlh5WXAxSmJTcWFuWVJGYkJyaVM3UVVpbmNJNzNMMzBOQ3NEcQpPL0lYcnM5djI4SzRDa3NDc3FHTUV0TXNVYkRieWF3Y2txamRvTDFKcHpuQ0w4U3dZd05BeHd0WmRVRkRQUGtvCmVuVitYc0lUYVhBKzFTZmRhWWZkcE5GTHNJNEdsODVQUXpyYkt0RnUwY2lOdU5UMTF2c2tsQ05SbWhEWmZ4bFIKSy9ZMzZFMVFiY3NpUzdFQVRIbExWZFk1MUNkVVg2RjJPNHVEMURlZ2FHM2dZZjgvWU4vQy9qVXZheHRLNE1ORQpiRVA5d0ZqZ3B2WVRkQ3RxcUExT0V1elJ6RXVyYUpTbGZRWjhWdjVjU2tqU2NXd1NGY3dZaHdWa3E5NHBKTmFzCmVZSFFjUUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFBM2RjbnMwK2NkYXpraGxqRDB0V2NvbjY5UVZ4S2FSdHh3TwpFWEUvZUNTZmJ5TjM5SWZwZ3gxa3NYcGFhRmdiS2t0NU9TZTBjRmE0SUZzaGFrbkx3K2pRQitCYWhIdDY3TCtBCkw5Tm16eFJ2ZDZGalkzNXpUeGcrMkRiRGhwVWtPRG9tQTA1WUVOU0syTDhTWitNSHZFV3RoRHFZRkp2NDJpWGYKVU1LM01hdVlLR0dRS21nSHp3cmdVUTJScXNKc1RaeXYzdXBCaFQ0SXRlK3E4ZElpa1VjalpLbGJpR0NYa2RrKwpwejdrWDROZG9XbzZ6bWt1YjBkbXJLekEvTzJrTG9FT2dyd1IzZzlFbVNxZTNNbDNVWUV4ZC82NVQ1VlZIbURwClZHYXVGNWFnSS9ydGMySGFIWjEzM2s1dFc3M3M4QnorUEplZHI2MjRseUFhSzlrVzVJVT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
- client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcGdJQkFBS0NBUUVBekVqT09wa1dBQUVVQkRqTS8xUTRJSWxOcFVVSTlsL3ArYWtlbFB0VmpoWWZYeVlwCjFKYlNxYW5ZUkZiQnJpUzdRVWluY0k3M0wzME5Dc0RxTy9JWHJzOXYyOEs0Q2tzQ3NxR01FdE1zVWJEYnlhd2MKa3FqZG9MMUpwem5DTDhTd1l3TkF4d3RaZFVGRFBQa29lblYrWHNJVGFYQSsxU2ZkYVlmZHBORkxzSTRHbDg1UApRenJiS3RGdTBjaU51TlQxMXZza2xDTlJtaERaZnhsUksvWTM2RTFRYmNzaVM3RUFUSGxMVmRZNTFDZFVYNkYyCk80dUQxRGVnYUczZ1lmOC9ZTi9DL2pVdmF4dEs0TU5FYkVQOXdGamdwdllUZEN0cXFBMU9FdXpSekV1cmFKU2wKZlFaOFZ2NWNTa2pTY1d3U0Zjd1lod1ZrcTk0cEpOYXNlWUhRY1FJREFRQUJBb0lCQVFDQWF1d3BiZjZrZGdrTgpObCszeWt1V09IbjFBTmJIZWpmdFYrRC9xcGQzd0hSc0xlTngzbllEYmQrajVoM095UXhsMTdSYVQ2VVgxemFSCm9nQWRPdXlrV1lacDBaZzc4RGQ3NzQzTWI2K1drdVUzZTloaVlZRWhBSjBDWUk2djFLZEZOdEJMejlpbW15WVgKZUZGMzJkQmM1UWVxNm9LMUlHQlJiTFZxWEorR0ZrSmp5YUd6QitIWVBxZXEvOVJhYThvcUxvNXNJa2s0WEViTQpxUjJDbld6dGhidVNXdVU4Wm8xWXRVbklLTGcvd2lneVJieVRDUU1uQWR6SzBlbzZtb1EvanNpeERvYS94THZoCmlnRHpMZlFRcVB2Uk9ZRFBkTFNESE92bWhCTTZCWHc1SHQzVkxOeEsyZk5BVHNHSCtnNjRBejM4clBkS1JYa1IKbDRFbGF2bUJBb0dCQU95WWdtYUtQNHBId3N2NEszV2RHUmgzbjNiVGZUMUt4dFFPL3p0Vm1qc3RwSnBpSTFKdAozdVVWbzhKbGFMZktxSmRIU1BSUm5ERlRVbFRkMXJSYlgwczNvcjFEOTNoeDFwMUV0U3lKZTV3c1RJNGhvUkFrCmN4M3crTE1lN1BvVEVBWnRXZmhxa25rYWFzUDdveFNSWWljK0JCcjRqZEM5YkdQZUtxQSs0ekVKQW9HQkFOMEoKNWJURk0yalkwRVluUU04M3dmTmgzVEtHMTd0Nys0dUQ5a2VmN3FaL3p6Rno4bFRmZi9LaEwrdE8vTmozYkN2OApUeDZHSkd6UUlRTUlqZDZWeWM0azNxdEhjQ0t1K21seEJMSGlOOGF2M2hBcTVqZ1B1RVpuS1RFYjhVUTNzWmhXCnFvVXR1bFVXZTk2aWJGQmJYK25QbXAzWnd0cHFCWWRYZnVmTUlzWXBBb0dCQU1vcWgwS1hYelFKbmFvc3BQWWIKQnhhaElPR29WWnZLQ1p1cU5PMitkOHVaZE0xMmpqZ2hLaFVXS0pnemp3ZDlaQkhnRjdhdEJZb2dhSG1jRlpxSAplU1lNcEVLVmtTQ2FKWWk4N1JMaFozNUxYQjhYSFVsdDIrLzV1SWxXSTZpTUlXVmNpMFI1ekM4dkk0dlR1Y1laCmRJV1R1RzVUZE5xcEFiVlVZWmdNSkpZQkFvR0JBTEJBamh3QkN5ZFZpMjRGS3RhUkhXU1c2cXk1ZlJpUW1sbjcKVmN4ektQYzIvdDN1R0pPNHkrdUt3QTBnSk5wVklMcEtMRVNvcmk3ZUh4U3VJNElUYXFHb0lLM3UvdW1KSVVBbQowSm1QU3U1eG1kN0dkbURKbUNUN2FZc3hQc2NvcWNKUmlSTTlEVkYvNWpIMnpldWRrUE45aVVySk0yaTZGY0ovCjhEK2hOVEZSQW9HQkFPbnZobCtoVHlBcktHS0ZkWjcvd3Z6dHRqTTZhMjRWdEpkS3ZwOTRUc25CRkNJRloxc2EKcTFBWVMvMEplUXJBOVJESlNDSzJxRTloQmhFUHk1RjlIQmdCQTZ6cDdQZFZ1MFFEQTNBYVdLdE5yTUF3SEhpTQo4SkNjRUFqaUZUdDVGQ2VGZ2FnSXVwdzMybzZNVVJVZndqcHVOcUFCa2dHUjRZdWwxNEhtdDJaNwotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
\ No newline at end of file
+ client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJZnBkSGl6Y05HQTB3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBeU1UTXlNVE16TWpCYUZ3MHlNREF5TVRneU1qUTJNemhhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXNTYlRDVW4rcksvYTAvUWMKUDNmU3dkRGVESXdHd2NKOHFFKzFQWmlrVVA4SDJnZ05ObGQ4TGl5ZXc3TmVkSkVYVTVMSTdDL1J5dkFzejdKbwprQlBGRm1xZWNWenF1SWc4ZEhqVnVRZVdaSWdlNkQwcHQ3UmxhNGkwbkJDSHVmTFg4YXpqYUJScGxHVVVKVEkzCmM5R2VzTmVOK3VtdUVtU1RSRUMxcStkbjhyVGxVa1dndnlwbzNTS2paQjVicXBvb0RrV1EvQTNFWkJieFhPOVcKbGR1NFVRUlVSdjNSS2JhMVBMbEdnT0xZcEc3Sko0NG05UFlmaEZQdkd4dExRYmJMQXU2aTZDcThYT0w5Q2F5YQpSOVNUK2lmaVBpQkR6V2YrY0NTS2NVZHAzaFNLU0IyUUJRVktvSmRMalNVT2RYOHZtTGlJbDFjWnJnd3BMNmh2Ck5XS3pad0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFDVVdIem44RTJCUFVPUVJ0MHNLOHVDRFo1NzYycGUxT0N3NwowQ0JMTXNBQ1Z6OFpGdEMvUkRmTFFsUGJud3dxTWkyMEl4anFyeElXMlB4WkFlR0tHc2plcTFoNGx0Y2lOb3BCCk55bTdscTBldFg4SnZhNnBrc1E4Z0FCTWY5SW9tZTh1enUrRXlIVjN2d2tFSldKWnNBLytqbFhYUThDZVVCcmsKR1NHTzI1V0Q0TXJITGxtb2hzbGc3Q2xHRHEveE9jSkVsUWx2ZU1mQjhQMk51T0NUWU5EYWFJZU9XQmtvbWpNeQpZdk1BeDdiM3VTL2dhVmdrN2RLZkxWWFJhb2dMVEZ4cXRQMWtsUnVpd2VjR0FLZ0VDdTZNdFpPRTZiZTkya1J5CkQxT2l1eFBGSkIreGRTU2hqVnNxcWtUQUFmQXVqWDFCVFlpZTAxbjd6b0tsSTdKblhYUT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+ client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBc1NiVENVbitySy9hMC9RY1AzZlN3ZERlREl3R3djSjhxRSsxUFppa1VQOEgyZ2dOCk5sZDhMaXlldzdOZWRKRVhVNUxJN0MvUnl2QXN6N0pva0JQRkZtcWVjVnpxdUlnOGRIalZ1UWVXWklnZTZEMHAKdDdSbGE0aTBuQkNIdWZMWDhhemphQlJwbEdVVUpUSTNjOUdlc05lTit1bXVFbVNUUkVDMXErZG44clRsVWtXZwp2eXBvM1NLalpCNWJxcG9vRGtXUS9BM0VaQmJ4WE85V2xkdTRVUVJVUnYzUktiYTFQTGxHZ09MWXBHN0pKNDRtCjlQWWZoRlB2R3h0TFFiYkxBdTZpNkNxOFhPTDlDYXlhUjlTVCtpZmlQaUJEeldmK2NDU0tjVWRwM2hTS1NCMlEKQlFWS29KZExqU1VPZFg4dm1MaUlsMWNacmd3cEw2aHZOV0t6WndJREFRQUJBb0lCQUczMnhKOEtnSHpmT0QzRApWTm1NM3BXU3VwTWRSSUIzNG50ejV2UVNVVVU1MmJ6Y3JKN2oxV0N3TCtrWTZYUUFNSE9mTlB0dmY1R3lYbzZhCmwwK0FCaUl4RXFNWjQxV2lzNncwNmEzT2FPdUVsM0xmcklxcy94dXVJemFSQ0Q5RDRBblRvT0dWY2lnOFNqSUEKcHUxTTNHMjNrQm1GZnBsS055UHg2eE9ITkQ0eVJWQW9raStEZlhZSWhTeWxTSFBMVGJmVEppUEZHSEVKZTNWNgo5VzQ5NXc5NjdBeDlDTUxOYndkN0lmeG5qbW42SlREVHFkdXVoWEtYakhjME9vQ2Z0cnc1L3VFclAwS1puY3JECldrQXBBNVRQMk9zQkN3RjVkTDJBV2dEQTA1N0xhU0I4bFVyZWx3TC9ucVBlT0xCU0J2YVJUR2J2MXFYUWNsTG4KR0huSEVia0NnWUVBeTB6SWozZVpTbUhUWlMxTkZ2eTlERzd3R2pqVm9WcmR5citXcVhxMjE3WFlZT1dsU3gzQgpRN08zZlV0QjY5SW4rSzVqcGFGRU1jWG43U1dZY3QyN29xclI4MTRqdzhRUGNIUWlmdjVCdUo1WmROTkJMd1NJCk16YWU5RU13YkkxZkgrUWd0clFscUUvSm8veUtzME1qQVE0cWlxTndBOUMzc0VjM1ZIb1k0bE1DZ1lFQTN4TFAKcnpFeEJWblp1cEQ5eHU5RjlOVVduR3RwMldJdC9ZOXE2M1gwUzJmOTd4ZWNuZnhkSTJ3aVlVeGZ1RFd1ZE81aQpWbU40QnZpaGcvaWRqRGovM01ZSC9PQ2ZYblJJMDZqZXlJVTZkTkxqeXh0SGppVkUrQnNORzBrNXg4akZINEdTCmdEbVkxWEtmbmtSbzZuNlJoazNXNXJ5a3Znc2wwTzRzQm5nb3NCMENnWUJ1TURyUVQ5RjgyRkxjbHRZZXJIUEcKeG1aS3dCMUI3RjhrSWYyRjlHWWZ1b2NCMWRabVJVVlg3Wk41VEkzNVJCbTRGc1VabzdPemlvR3ZMbDVYZThqVQpYT09ZbGFDcTNaeEVwaDJBV1V6RHhNZlZveDdFWGg5NEtwV3k3S3ZWV2phQnNZTHRvK3g1TW0ybS9SMHNGaXBsCnl3alJ4YzNUczQrcjhwMlJvdS9UMHdLQmdBTUhoRjZDc29HNkdLVFo5emhPWTRyUm9mNzV6blF2U3lTWVlBRlcKbHJ5M2F0Rm1ackFXajBVOTRMR2xrZDgwaTJ2M0dNckhpd2U5TktSUUtnT1BlcG9LN216V3VCTldUTzdpNmpPYQo2NUpPa3QxZFAzbUV0QTBTZ1BrUDQ0TDlEUUJDaURUSmszUENuTHhQZllWQnRzUTJKbWIzeE56MzFjbWlrbUo4CkcwRlpBb0dCQUlraFVENVBaMy9XUzdlOWJMTW9qQUlZdDJTS2UrTUZhTmJRYkhvcXh2ck1GMXordTFwalV1elAKaVhtOTRjbHJCWnJoTTJDdzRKc1ZDUGdrTExCbXlIVzdiaEJ6cWNhQktqeE14a2dMQU1KOXRvczgzODBIdDdUTQpRa0pUTmRkVWdKc1lMaWVqZHRGVjVLZDZIekMvdHpkb2N6YTZwTGE2a3Q0OHN2ZnQyQzhoCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
\ No newline at end of file
diff --git a/kubernetes-configs/mcord-barcellona-remote-dt.yml b/kubernetes-configs/mcord-barcellona-remote-dt.yml
index 5bbb7f0..91226b7 100644
--- a/kubernetes-configs/mcord-barcellona-remote-dt.yml
+++ b/kubernetes-configs/mcord-barcellona-remote-dt.yml
@@ -1,3 +1,11 @@
---
-global:
- registry: '192.168.87.2:30500/'
+
+mme:
+ images:
+ init: "node1:30500/ngick8stesting/c3po-mmeinit"
+
+hssdb_node_selector: node1
+hss_node_selector: node1
+mme_node_selector: node1
+spgwc_node_selector: node1
+cdn_node_selector: node1
diff --git a/kubernetes-configs/onf-mcord-pod1.conf b/kubernetes-configs/onf-mcord-pod1.conf
index bfaec46..2c019cd 100644
--- a/kubernetes-configs/onf-mcord-pod1.conf
+++ b/kubernetes-configs/onf-mcord-pod1.conf
@@ -1,7 +1,7 @@
apiVersion: v1
clusters:
- cluster:
- certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1ESXhNVEU0TXpjMU9Wb1hEVEk1TURJd09ERTRNemMxT1Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBT0dXCmFGQUU0cUZUMTV5NWQ1ZFNlK240QU1BWjJzdy80VXZjNFNTc2dCcVNFa2ZHMDhNUGJ4QXFLZzRIOFIzTVgvQkoKa1I5a0JmNVA4d2hDZU95NjU0SmlqU3NuL0xHUG5QTkhtTGh3U2lvZVg0L1E4U0NnMGZLUFNXZmVEQ0xycHY5VQo1Vi9DVEpHa29leFNLUGlsb3pFTSszeG9EdjRTRjN5bXYwNkNZeHF0dWlwc0xDYlJ5Y2VGRW96eWtVcFlWWXNDCkg5UlFlVEdUZEFiZmxjY0xwTFBHS1VqZGw1VUQ2aFN5OHh1QWQ2UWNSTUZxeGdjaTVwTmZoZnAvbEdRNTAzaGgKK294UkJ6WTd5SWFxQ3ZNWDFSZnpXeHJZZXpVVGduVHo5NDBwU2k1OWQ4R29CL3VhdUdFMHVOUElYN1pIUDJUNQo5S3JKaGI4M0ZmSTRTbFkzVGlrQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFIZ2FPZkdSL0ZTUlMzemV2OXdmdjlIY1NaWEQKQ2NuaWZpeUFlTi9QbmRkejljMWFXMng5QlcvTVpnWjdiN0w4NWNHQUM3ZlRPUTJGb0xnRkZ6Skc3SVpWczJaegp4YkhGVUZtcGlCblY1dUhYR3Z6eng2Y3hSWjBOTnE3VndKMnE2K3RKdEpUM2xIcUV0UmYwVW1IaENUYldzRDVaClFGTVl5NFV1M25rTnZlaWlHK2lTclJieGRzaVRaU3JJWnM0Zkp0RTJ0RzZaakdJZ1dBQjdMRVV1SVhKR3NocVMKL2x2MjFPNmk0TCtJOWVycGUvVTFocm9qbWZjUGR2c2dtYTQvSlMzdGUvVTlSRG43WUg3c0NlTGpzS0JxeU9FOQpUbVhKdjNlaGgxeHBlMG5URUowc2RpYm5ZeUFUMTc5OWNKSHk3UHRyam1NVDB4bFBnVUd3KzZrOGx1TT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+ certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1ESXhOakExTkRBek9Wb1hEVEk1TURJeE16QTFOREF6T1Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTitBCldrdjZLVERNMDc5c0w5MG1XaHRsQlJoR1pOam5FMEVIdGlzckprMnJiTjV5TXJhSkU1WEZ0WGFqSU0yWjZ0RHEKVEQxUlNIeGViNi8xeUtnMUx1REphNWRocXRlNUZDL09lRkRINWJEeTR1a1B1UmZsVlZkNFByT0JDSThKVGZPQgpOYzFNdUxxUi9IV09pc2NFbjNreUo3QUdaM2srTlZGWWVpZmZHcHo5U2dGU2pKUCtsSGZEMk9sQm5DL2FiRC9nCkdMamh4Z3pqQnJTbDM3YUFxV0FQS1ZCL056RklubE92bldJMFgxS0hEbEhPUERYdnQ2dllJS0IyaWNPK0kzTjEKQktFQzY4S1B6MFQ5U2c5WHZ3SEVQOUhibURQMm5HQ0xPeGNqS3VyeUdXT2ZSMjQyK2ZiM21VQStXcXkwc1JubwpJUnF5WHUxS2xNbzV1Y29mUTRjQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFDb0xpVmdIR2I2aGEwNWhSNktMSWpBWXA1WVAKZ1drZFdSbjBIYjRKeW1FT3VoenBqNnIrbEgzNlZpallvVFRlZ3RyL0t1MXNjYlBCMHloZ2cxOWFkUDZ6Qk4yRQo3UHNoN21ac0dqY3QwaTk4SHpySDh2MktCOUpqSGN4WDlJb3U3Mk96b094NWw2WGtzZEdEVHVoa0paZS9mazdmCnpsTC9QTjNUbTFCTERld01HdFBEU3dwSDUwN3pwRFZMZVJ0bFFmdWNCaHA0QUo1d0hJb044UTZtSkFwUVkyU2oKZlcxSzc5TE85bW9BKy91SXdTeTVubXdkakdHZTkvWXIraklJREtzei9LaHJyRTZOclcrNks1Q0M0aFpPVGo2RgpYakFXWlBrV1YwY1FjOVFsa3pIT1BVMWZQbHA2M29SbDVWQ2JveUViTFVwSndKZ0oyejJzV3dWVkdSST0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
server: https://10.90.0.131:6443
name: kubernetes
contexts:
@@ -15,5 +15,5 @@
users:
- name: kubernetes-admin
user:
- client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJYWZSU0hoREZ4aUl3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBeU1URXhPRE0zTlRsYUZ3MHlNREF5TVRFeE9ETTVNak5hTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQW5RQW40c0lIdUlnWlV2cGwKNDFuRlpaMVl0ZHhPb0c4WVlFSC9kVTI2L0FxRW1KWGRzL2RhYnNTbWVWWnZ4aXVyM0laaytobG95ME9lV3lnYQpISytRMWwvK2ZzL1pnN21nN0NEZ053Q0xsNWNkb2hYaWxVb2NqR0JRenRla215ZnEzSTZwRitSdmo3YUZGR0d0CnI4aDVsdzR6YVhUUlVQMUxIWklGbU1QNjcxc0hzbTYrai9Qd0JsOGxWMEtmK0N0OHdYdzc2R0hPRTl4Q0VOVC8KV01sYTUrT3MyQUdsaVhJRnV3MXhZWlFPbUx2a3NJbVZOa2hheFFkSFdhbUgyVEMrcGkrdWpKS3RFNXFSNzFyZwp3WVJTM1lFZml5bTA3YnI3ZVdTTXZFeEJ3anhrc1JwaGFCWnVwZkQ0SGpLcnJ6T3NrVXVDV1R4WFh4d0F2OXV0CnBRZnYwd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFHNWp4enJKZERrREx2bmo1ekx4RnpZZk56RmdtMUFMa0hCOQpYQXZSMERHMkIycWNuYWsrSXhySWZ0Y3A4NXU0U3ZBdnlkaUF3WTQrL0l6eXZXZUF1NU9WTEdVQW9kcXdHc1pWCmRYRTYvMElucSs5TWR1Qmhja2U3RnN4QjJ1d3IveWpxeUVCTlcyYVA3MldOeGpmVUhrUU9GUTJObE9TZmZPUjcKVUFjMXgrZGIrOUk5Q21GaFM4ODZGdEZnYlZMQ3FNVjF4WU8vK2RUOWZxY1dKWXdaV2lEYVFDWkJBdzB4b3dBeQowTndsSjVMMFZLTzlDSVZkOWdxUDlhTE5QMHl5b2w1L05xYzJTLzJVWVNjRDlrRjdaNVNBK0VGTURnVWZ3QWVJCnE4UWJCeWFLaTZkUnZYR1VxUElGN1lCeHNXNEdOQzhKK2ladEJBWW9DbGU0ZEhpdW1IST0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
- client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBblFBbjRzSUh1SWdaVXZwbDQxbkZaWjFZdGR4T29HOFlZRUgvZFUyNi9BcUVtSlhkCnMvZGFic1NtZVZadnhpdXIzSVprK2hsb3kwT2VXeWdhSEsrUTFsLytmcy9aZzdtZzdDRGdOd0NMbDVjZG9oWGkKbFVvY2pHQlF6dGVrbXlmcTNJNnBGK1J2ajdhRkZHR3RyOGg1bHc0emFYVFJVUDFMSFpJRm1NUDY3MXNIc202KwpqL1B3Qmw4bFYwS2YrQ3Q4d1h3NzZHSE9FOXhDRU5UL1dNbGE1K09zMkFHbGlYSUZ1dzF4WVpRT21MdmtzSW1WCk5raGF4UWRIV2FtSDJUQytwaSt1akpLdEU1cVI3MXJnd1lSUzNZRWZpeW0wN2JyN2VXU012RXhCd2p4a3NScGgKYUJadXBmRDRIaktycnpPc2tVdUNXVHhYWHh3QXY5dXRwUWZ2MHdJREFRQUJBb0lCQVFDY0RVeVg2bzVzRC9ORAo5Qm1VQ21YWG83ZEtSR2x1dEI1Qmh6Z1k2Nk1nNUg5NWZ2VDM3YlBZaCtTRWxMTFRBaE40UmFsV29pejBaUWlnCnlOSnprdHBmQ3RsV1NOaUdRdHM5K1V1RHdDb0FDamR0SlYyclVCZmlPOVgyVW9lTnBQYWdOYmpEUTg3VHhQS3cKR0lyZ1AxOEVFeHh0QkswTldFYnlaSExscmw3Y3kwck1vdEZlUURDMGVqeHBUTHBWdzh1cEkxeUtEK0tjdjRhOApTUHZsZXoyM1RTME5Lc0VWMEZHSkpyVEtwNUg0UUNOdHJSRWtYY0xLZnNWSWk4am50ampHaWUxTEloTVRKVHpLCm90L2hROWxOSGFXaDlIUEM4UmpoblpNVHN2MFdaNGtyYnU1SGFZc3BROW8zZlZOL25ZdnlQZTBYZDVaanoxcWcKMTdsaXlvcUJBb0dCQU0wYzgyY1NialBpZEFFdk1hd0NyKzZVNFM4amg1MzRzS3NMZGIzVXVNQmEyaDZVTnhjRwo1ZE5ocEZoTm42ZVZrUmFlank5LzFhT1JkbjVJTmgwNWRXQXRnZG9pVkxqVi9lcnBSd1RNSUMxR05JMWNTVzF5ClZjdExGc0t3YkVwdTBKa05BZytmSnFuR1Z6blB2eW9LbnhnU3ZXYnRyQ0NMMUorM2d2OUhiQ2tUQW9HQkFNUHoKZ2MxMGVEVlFONDBxanFoSU9SY3lGMzRhVEpyNWJtU2N5Q2d4aHgwMkdZV0wveWx0QW8raDM2b1VVNTFNR3oxZgo1eU10V2tkV3RYTGNIZzUzQ1hOMlRuZHd1WmJNTmw1RDhLVWJubWJwSHQ3cnJZSnQ5SmVnTkJPdU4yTnQwK3E1CkZacmlZalhoS0NHR012c1lDSzBRcmJMVXl1YUUrTTlkWTR2bTZyWkJBb0dBVjE5bXU5aFpBMWNLalZxYU1TaXYKNHRTZW0rTHBxVHcvbll6ektkc01uRHZYUUVGb3VqRmhBMHRMbzZYbFJaRHJ6aFBhOEtQbTBKZHRQMXZwV1VlWgpuVStsU2RObi9aaUNZbWZlcmNkNlNXN25nZlAyLzEwOStLeFMxTG9zVndTZmJTTGladDhuckJobUhhVkdURlZiCjhmaEJvQy9NSzgwRTFNaHFUKzRQditzQ2dZRUFscEt2MCtrRDFqUGwvQndQczFDTVRqNjN2cmNHMXErRkhOczkKRTJXN3BiN0VyZEorS0o4VHNMdDYyMzd6SVpReCtsK1BoWUI4TndWeU9PamNUOUU0K2ZpWEkwRUQyOVRna2w4eQp0QzBjODRkL3FWMEEzNUVPdXRUb0w1ZFlDSmVFbUlIUkVFdVZuRUdBVFFLS2VsaGxrbGVXb2l6U0hZRmdrRGY3CkhxNDYvZ0VDZ1lCR3EyZGNvaVpSQnFaOFJJSVhHc2thU1YzWEhBVUVSa3NXd3lrZTVKTXRYY3V2TG1TNG02Q3AKNlNaZmE5Z2pVMStmR2t6N2RCWHlFeWxpcmMvUGM5SG1UeUVPN1NFVzg0eWhjb1RZN2FnZkR2VVNGZjFYRWJlNgpaUmhKNlByTEZmVHJuMmpGUVdEbXEzZnJCMWFteVdxR25GdUl0MnB0ekl6NGJKYlhxWllqaUE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
\ No newline at end of file
+ client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJWVkveFJRR0tnV0l3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBeU1UWXdOVFF3TXpsYUZ3MHlNREF5TVRZd05UUXhOVGxhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXdNTEpZU1E5amd3M2dBWHUKY3V6cStMN21PdXd2ODhuTnBrSVBsbHlqdWd2NEl5M0J0TDIybmZoT0tEcllKUHA2bG1oOUVXd2FwbXF5cmd3MQoyV2g5b2JVVUtJaG1wZnc5cGJSbFNNRnpNK1ZBeVhNQ24ycnFDRGV2bHY4NENhUFdaZDdWaU1BSDVqd3BXNy9sCkNabXQxSTNoQjdWRnNFbkFaWURiYmlwN1ZzaUxIWmJnQnNXL3lWZ3JZaVh1emdOMVpybm4rallTWElaTCsvYlgKdll1TlFuaUtYcURENUtnWWx1czJ4M1hzOHFHdTA5WlM2bGV3OWozWHNtV0JIQWFDNFBwZm5kWG9WQUNvbFZKWQp0WkpmMlhzWGsrZHBMbVc0ODNZcFlESDltdzBuWVV3ejZRS2R1aEMzWncrbEdTSk1BaHc1dFNqM1Bqb0xidk5qCnk1UEVtd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJeVFrc2pKeWlQc2RVTng1KzVLTzN0dlpQaThtbjFOTDAyUwpUeWd5ZWRaR3E0QXNnajBkMUF6NFVhcXljOFUrT1EwdTV4cjRyZW05elRsRmx2V1V0MFBpYUhCak1zdStDZUpDCjZVN2h3WTNjemwxSTJrSmRYYWJYaWZDYUozL1hYQk1xOGVDNDNNT0NxM1A4NE1RYzRMNlJwV3diaFA4aGttODgKQVNZM1U0a2Y1eFlBWHFUQ21xWHR1RHJ3M1l4VnZOM0JaYlIwcDUwRE1uSS9uU1BzaklpN01VL1JpMmp2VGZtTApJcUVmQ0NaNkxtTzFhU3lyTXBhSDRzZ3FEZHNVc1FsTlY3SFFIUG00by93SnJYdit5YklFVmFkRHdKMEExTWUxCnVYR3RNS3lJa1VGUTRZTDJwM2QwRlNnbUZaYk5CTis5M3k2KzdFa01mcEwwcXJ1aGRRWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+ client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBd01MSllTUTlqZ3czZ0FYdWN1enErTDdtT3V3djg4bk5wa0lQbGx5anVndjRJeTNCCnRMMjJuZmhPS0RyWUpQcDZsbWg5RVd3YXBtcXlyZ3cxMldoOW9iVVVLSWhtcGZ3OXBiUmxTTUZ6TStWQXlYTUMKbjJycUNEZXZsdjg0Q2FQV1pkN1ZpTUFINWp3cFc3L2xDWm10MUkzaEI3VkZzRW5BWllEYmJpcDdWc2lMSFpiZwpCc1cveVZncllpWHV6Z04xWnJubitqWVNYSVpMKy9iWHZZdU5RbmlLWHFERDVLZ1lsdXMyeDNYczhxR3UwOVpTCjZsZXc5ajNYc21XQkhBYUM0UHBmbmRYb1ZBQ29sVkpZdFpKZjJYc1hrK2RwTG1XNDgzWXBZREg5bXcwbllVd3oKNlFLZHVoQzNadytsR1NKTUFodzV0U2ozUGpvTGJ2Tmp5NVBFbXdJREFRQUJBb0lCQVFDWFNJamFONklqMk15NgpLbTJSUHdYUEFhd1p0SUtSOStEeHlra0hmbDkxUmEyU2xuZS9qV0ZFcTd0VGNaTnZ1akg1MTduSXNhcGN6OEs2ClBKVUtzeXBlZm9wNm9VckduS2daWS9KVjNwVzJ0Z2RaMDJ6TWh4RjBMNWdjanVPQkZWZlFEY3BURUR0aTQvYWwKcm41b1FYZWZLVmJpUU0rWDR0b2dEN2lueHFtVVdtUVhmOWpxcjJ1aTAxU3QrSkFJMS85U3hkd29QMkNlbG1YcQpZTGxRUFhxZlB0Z0xUcnpCbHNDS2lFeGplMTJya2podjI5QVc2bzlEamxRQk82QnZQMFhmOHlhUldoUEdEYWNZCkduREdNRHpteXpnTTFVMUVGL0NoTml2UE9LaUx6M2dxa1dteUdTd2ErTXVzOUE5NjBRTzdhZlVrNFhFVExqbVcKUVFNMFdDOFpBb0dCQVBUR3hXNVc4SGRnRGxJclQzN2NSb0lxTHVHdW9LQkZzSmpvelEzQXI2TXErNFhyVHJMRQpJZG1NNkE1bTlQbW9mQTdpeGFsbi9ka0c3VmhZWGNUeWVYM1RINS9YNyt1NzFxMnNkMklHbis4Sm9xU3c1TldnCnNZTVMzclZNeittdHhjTHMxM3RwNm9qRy9Nc2JyVFFFOTZYcWFkdWw5ZlZ6c0JmVTAydHlhd1FOQW9HQkFNbVoKY3BlbEhGU0UvSXUzNkxWWlJJcStCSk80ZUtpUWVLeUpOcFR6aXZkMk5oVGVqZkpkMmJLVHo0ZXpWdmptTWo4dQpMYWVDZkxGUkJlUmdES2R5c1EzQ0QrNnpQRjZkSk56a3dhZkhCRGs5NWxjK1RlVXF2ZnlxQmVnR3pHMEdqRDNUCnR6Ky9oTjhaMkdyNzl5TVdYVEd1QTJ3dmNzTzdudSs0ODAyR2lmbEhBb0dBR0ZGekplNHZQN3prVDFlTU0wOVIKRmZkNDV1VUJna3JLSzdiZFFHT0hUNCtpbzRCb05peDBMSGZxU2h3Q2RKYy9rLzhGb2puNXAwa2Y1V29LRHRvRQpKZk1Hcmt1MncxWExFMEFTTUVQMk9icGNWVDVaemJ1RVIwQmxyZDl1dkltT0h6cUdnZlZZM3JQZVE1T0JWcXl6CnFlRXJHUzVZekVUdEZzRUhMQ0tXN1RVQ2dZQitkWWtTWXZvUWNwTlF1WDU2TTVMeFRSemw1UE9iR1hUNUZlRnQKTWhCY0JvVUtOa2pvWGNLdmFGVG9GTEZiMUZwMGsyMEVCTEJmTWluMkJlSXFMNkdzdGF6MDJPM25rNytKNk4wcApkNGZJdUhHRERJd2tVdGwyWXRqdG9VWWVwZHJXOWJXZmdXM0IzUjZLalorTEhQNDhxYUZ2L1p1SitHbE1pc0hrClFaN1BCUUtCZ0ZFNGtoTEdUTE11NTd6ZGpBTEZmNFVIWlZNZm9iWXRJUXlZc1dRb1poa2VHWXFxQ0VPN0JoSHAKT1VGaGxKNkhtMG9kWExDOEpaaHc3VFkyMUkxUytGYkJLNVhoSWdyeTkxQ0h4N0tzdUVlZjR2ZmZRUmcySUJPWgoyazRQNUROQjdVZm4wa0QyTzU4TFdGU0haU2lQb0tLdmVYUXE3OXFCN3hrYVZvaVh3VWNQCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
\ No newline at end of file
diff --git a/kubernetes-configs/onf-mcord-pod1.yml b/kubernetes-configs/onf-mcord-pod1.yml
index 329dcb0..b34bf1d 100644
--- a/kubernetes-configs/onf-mcord-pod1.yml
+++ b/kubernetes-configs/onf-mcord-pod1.yml
@@ -1,26 +1,37 @@
---
+xos-gui:
+ images:
+ xos_gui:
+ repository: 'matteoscandolo/xos-gui'
+ tag: "mwc"
+
+log_agent:
+ enabled: false
vrouter:
image:
repository: 'matteoscandolo/vrouter-synchronizer'
tag: 'latest'
-
-mcord-control-plane:
- hss:
- images:
- init: "10.90.0.131:30500/ngick8stesting/c3po-cassandra:5e2eaf6"
- hss: "10.90.0.131:30500/ngick8stesting/c3po-hss:5e2eaf6"
- mme:
- images:
- init: "10.90.0.131:30500/ngick8stesting/c3po-mmeinit:5e2eaf6"
- mme: "10.90.0.131:30500/ngick8stesting/c3po-mme:5e2eaf6"
- ngic_cp:
- images:
- init: "10.90.0.131:30500/ngick8stesting/c3po-mmeinit:5e2eaf6"
- cp: "10.90.0.131:30500/ngick8stesting/ngic-cp:690f418"
-mcord-data-plane:
- ngic_dp:
- images:
- init: "10.90.0.131:30500/ngick8stesting/c3po-mmeinit:5e2eaf6"
- dp: "10.90.0.131:30500/ngick8stesting/ngic-dp:690f418"
+progran:
+ image:
+ repository: '10.90.0.131:30500/xosproject/progran-synchronizer'
+ tag: 'candidate'
+
+# hss:
+# images:
+# init: "10.90.0.131:30500/ngick8stesting/c3po-cassandra:5e2eaf6"
+# hss: "10.90.0.131:30500/ngick8stesting/c3po-hss:5e2eaf6"
+# mme:
+# images:
+# init: "10.90.0.131:30500/ngick8stesting/c3po-mmeinit:5e2eaf6"
+# mme: "10.90.0.131:30500/ngick8stesting/c3po-mme:5e2eaf6"
+# ngic_cp:
+# images:
+# init: "10.90.0.131:30500/ngick8stesting/c3po-mmeinit:5e2eaf6"
+# cp: "10.90.0.131:30500/ngick8stesting/ngic-cp:690f418"
+#
+# ngic_dp:
+# images:
+# init: "10.90.0.131:30500/ngick8stesting/c3po-mmeinit:5e2eaf6"
+# dp: "10.90.0.131:30500/ngick8stesting/ngic-dp:690f418"
diff --git a/tosca-configs/mcord/onf-mcord-pod1-fabric.yaml b/tosca-configs/mcord/onf-mcord-pod1-fabric.yaml
index b306ac5..148f887 100644
--- a/tosca-configs/mcord/onf-mcord-pod1-fabric.yaml
+++ b/tosca-configs/mcord/onf-mcord-pod1-fabric.yaml
@@ -90,11 +90,20 @@
- site_deployment:
node: site_deployment
relationship: tosca.relationships.BelongsToOne
+ service#vrouter:
+ type: tosca.nodes.VRouterService
+ properties:
+ name: vrouter
+ must-exist: true
vroutersi#calico:
type: tosca.nodes.VRouterServiceInstance
properties:
name: calico
+ requirements:
+ - owner:
+ node: service#vrouter
+ relationship: tosca.relationships.BelongsToOne
# Fabric configuration
switch#leaf_1:
@@ -104,12 +113,12 @@
ipv4Loopback: 192.168.0.204
ipv4NodeSid: 214
isEdgeRouter: true
- name: Agg Switch
+ name: AGG_SWITCH
ofId: of:0000000000000001
routerMac: 54:87:de:ad:be:ef
- # Node1 Port
- port#node_1_port:
+ # eNodeB - rru Port
+ port#rru_port:
type: tosca.nodes.SwitchPort
properties:
portId: 33
@@ -122,17 +131,17 @@
type: tosca.nodes.PortInterface
properties:
vlanUntagged: 20
- name: node_1
+ name: rru
requirements:
- port:
- node: port#node_1_port
+ node: port#rru_port
relationship: tosca.relationships.BelongsToOne
ip#port_1_ip_1:
type: tosca.nodes.FabricIpAddress
properties:
ip: 13.1.1.0/24
- description: node_1_ip_1
+ description: rru_ip_1
requirements:
- interface:
node: interface#port_1_interface
@@ -142,7 +151,7 @@
type: tosca.nodes.FabricIpAddress
properties:
ip: 119.0.0.254/24
- description: node_1_ip_2
+ description: rru_ip_2
requirements:
- interface:
node: interface#port_1_interface
@@ -152,14 +161,14 @@
type: tosca.nodes.FabricIpAddress
properties:
ip: 116.0.0.254/24
- description: node_1_ip_3
+ description: rru_ip_3
requirements:
- interface:
node: interface#port_1_interface
relationship: tosca.relationships.BelongsToOne
- # Node2 Port
- port#node_2_port:
+ # Node1 Port
+ port#node_1_port:
type: tosca.nodes.SwitchPort
properties:
portId: 34
@@ -172,17 +181,17 @@
type: tosca.nodes.PortInterface
properties:
vlanUntagged: 20
- name: node_2
+ name: node_1
requirements:
- port:
- node: port#node_2_port
+ node: port#node_1_port
relationship: tosca.relationships.BelongsToOne
ip#port_2_ip_1:
type: tosca.nodes.FabricIpAddress
properties:
ip: 13.1.1.0/24
- description: node_2_ip_1
+ description: node_1_ip_1
requirements:
- interface:
node: interface#port_2_interface
@@ -192,7 +201,7 @@
type: tosca.nodes.FabricIpAddress
properties:
ip: 119.0.0.254/24
- description: node_2_ip_2
+ description: node_1_ip_2
requirements:
- interface:
node: interface#port_2_interface
@@ -202,14 +211,14 @@
type: tosca.nodes.FabricIpAddress
properties:
ip: 116.0.0.254/24
- description: node_2_ip_3
+ description: node_1_ip_3
requirements:
- interface:
node: interface#port_2_interface
relationship: tosca.relationships.BelongsToOne
- # Node3 Port
- port#node_3_port:
+ # Node2 Port
+ port#node_2_port:
type: tosca.nodes.SwitchPort
properties:
portId: 35
@@ -222,17 +231,17 @@
type: tosca.nodes.PortInterface
properties:
vlanUntagged: 20
- name: node_3
+ name: node_2
requirements:
- port:
- node: port#node_3_port
+ node: port#node_2_port
relationship: tosca.relationships.BelongsToOne
ip#port_3_ip_1:
type: tosca.nodes.FabricIpAddress
properties:
ip: 13.1.1.0/24
- description: node_3_ip_1
+ description: node_2_ip_1
requirements:
- interface:
node: interface#port_3_interface
@@ -242,7 +251,7 @@
type: tosca.nodes.FabricIpAddress
properties:
ip: 119.0.0.254/24
- description: node_3_ip_2
+ description: node_2_ip_2
requirements:
- interface:
node: interface#port_3_interface
@@ -252,9 +261,58 @@
type: tosca.nodes.FabricIpAddress
properties:
ip: 116.0.0.254/24
- description: node_3_ip_2
+ description: node_2_ip_3
requirements:
- interface:
node: interface#port_3_interface
relationship: tosca.relationships.BelongsToOne
+ # Node3 Port
+ port#node_3_port:
+ type: tosca.nodes.SwitchPort
+ properties:
+ portId: 36
+ requirements:
+ - switch:
+ node: switch#leaf_1
+ relationship: tosca.relationships.BelongsToOne
+
+ interface#port_4_interface:
+ type: tosca.nodes.PortInterface
+ properties:
+ vlanUntagged: 20
+ name: node_3
+ requirements:
+ - port:
+ node: port#node_3_port
+ relationship: tosca.relationships.BelongsToOne
+
+ ip#port_4_ip_1:
+ type: tosca.nodes.FabricIpAddress
+ properties:
+ ip: 13.1.1.0/24
+ description: node_3_ip_1
+ requirements:
+ - interface:
+ node: interface#port_4_interface
+ relationship: tosca.relationships.BelongsToOne
+
+ ip#port_4_ip_2:
+ type: tosca.nodes.FabricIpAddress
+ properties:
+ ip: 119.0.0.254/24
+ description: node_3_ip_2
+ requirements:
+ - interface:
+ node: interface#port_4_interface
+ relationship: tosca.relationships.BelongsToOne
+
+ ip#port_4_ip_3:
+ type: tosca.nodes.FabricIpAddress
+ properties:
+ ip: 116.0.0.254/24
+ description: node_3_ip_2
+ requirements:
+ - interface:
+ node: interface#port_4_interface
+ relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/mcord/onf-mcord-pod1-progran.yaml b/tosca-configs/mcord/onf-mcord-pod1-progran.yaml
new file mode 100644
index 0000000..da17bb3
--- /dev/null
+++ b/tosca-configs/mcord/onf-mcord-pod1-progran.yaml
@@ -0,0 +1,151 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
+
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onf-mcord-pod1-progran.yaml http://10.90.0.131:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+ - custom_types/handover.yaml
+ - custom_types/enodeb.yaml
+ - custom_types/serviceinstancelink.yaml
+ - custom_types/progranservice.yaml
+ - custom_types/progranserviceinstance.yaml
+ - custom_types/mcordsubscriberservice.yaml
+ - custom_types/mcordsubscriberinstance.yaml
+
+topology_template:
+ node_templates:
+
+ service#progran:
+ type: tosca.nodes.ProgranService
+ properties:
+ name: progran
+ must-exist: true
+
+ service#mcord:
+ type: tosca.nodes.MCordSubscriberService
+ properties:
+ name: mcord
+ must-exist: true
+
+ handover#barcelona-handover:
+ type: tosca.nodes.Handover
+ properties:
+ name: barcelona-handover
+ A3offset: 1
+ A3TriggerQuantity: 0
+ A5Thresh1Rsrp: 74
+ A5Thresh1Rsrq: 10
+ A5Thresh2Rsrp: 78
+ A5Thresh2Rsrq: 10
+ A5TriggerQuantity: 0
+ A5TriggerType: 0
+ HysteresisA3: 0
+ HysteresisA5: 1
+
+ enodeb#accelleran:
+ type: tosca.nodes.ENodeB
+ properties:
+ description: accelleran
+ enbId: "1"
+ ipAddr: 0.0.0.0
+
+ # SUBSCRIBERS
+ imsi#IMSI1:
+ type: tosca.nodes.MCordSubscriberInstance
+ properties:
+ imsi_number: "302720100000420"
+ name: IMSI1
+ ue_status: "1"
+ requirements:
+ - owner:
+ node: service#mcord
+ relationship: tosca.relationships.BelongsToOne
+
+ imsi#IMSI2:
+ type: tosca.nodes.MCordSubscriberInstance
+ properties:
+ imsi_number: "302720100000421"
+ name: IMSI2
+ ue_status: "1"
+ requirements:
+ - owner:
+ node: service#mcord
+ relationship: tosca.relationships.BelongsToOne
+
+ profile#video-slice:
+ type: tosca.nodes.ProgranServiceInstance
+ properties:
+ name: video-slice
+ CellIndividualOffset: 0
+ DlWifiRate: 0
+ DlSchedType: RR
+ DlAllocRBRate: 50
+ UlSchedType: RR
+ UlAllocRBRate: 50
+ mmeip: 10.90.0.152
+ mmeport: "31412"
+ requirements:
+ - owner:
+ node: service#progran
+ relationship: tosca.relationships.BelongsToOne
+ - handover:
+ node: handover#barcelona-handover
+ relationship: tosca.relationships.BelongsToOne
+ - enodeb:
+ node: enodeb#accelleran
+ relationship: tosca.relationships.BelongsToOne
+
+ profile#download-slice:
+ type: tosca.nodes.ProgranServiceInstance
+ properties:
+ name: download-slice
+ CellIndividualOffset: 0
+ DlWifiRate: 0
+ DlSchedType: RR
+ DlAllocRBRate: 20
+ UlSchedType: RR
+ UlAllocRBRate: 20
+ mmeip: 10.90.0.152
+ mmeport: "31412"
+ requirements:
+ - owner:
+ node: service#progran
+ relationship: tosca.relationships.BelongsToOne
+ - handover:
+ node: handover#barcelona-handover
+ relationship: tosca.relationships.BelongsToOne
+ - enodeb:
+ node: enodeb#accelleran
+ relationship: tosca.relationships.BelongsToOne
+
+ imsi2_to_video_slice:
+ type: tosca.nodes.ServiceInstanceLink
+ requirements:
+ - provider_service_instance:
+ node: profile#video-slice
+ relationship: tosca.relationships.BelongsToOne
+ - subscriber_service_instance:
+ node: imsi#IMSI2
+ relationship: tosca.relationships.BelongsToOne
+
+ imsi1_to_download_slice:
+ type: tosca.nodes.ServiceInstanceLink
+ requirements:
+ - provider_service_instance:
+ node: profile#download-slice
+ relationship: tosca.relationships.BelongsToOne
+ - subscriber_service_instance:
+ node: imsi#IMSI1
+ relationship: tosca.relationships.BelongsToOne