Add DANM network support

This commit allows us to define DANM networks in the recipe file.
Currently kong ingress controller will automatically pick the DANM network config.
Other components will require manuallly adding annotations in the recipe file
in order to avoid forking the helm charts.

Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I2bfa1ee1d8a4f34624da957677ac84787cef8f03

diff --git a/ric-aux/helm/infrastructure/subcharts/danm-networks/Chart.yaml b/ric-aux/helm/infrastructure/subcharts/danm-networks/Chart.yaml
new file mode 100644 (file)
index 0000000..0a59405
--- /dev/null
+++ b/ric-aux/helm/infrastructure/subcharts/danm-networks/Chart.yaml
@@ -0,0 +1,23 @@
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#   Copyright (c) 2019 Nokia.                                                  #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for setting up danm networks
+name: danm-networks
+version: 1.0.0
+

diff --git a/ric-aux/helm/infrastructure/subcharts/danm-networks/templates/danm.yaml b/ric-aux/helm/infrastructure/subcharts/danm-networks/templates/danm.yaml
new file mode 100644 (file)
index 0000000..cc4c02d
--- /dev/null
+++ b/ric-aux/helm/infrastructure/subcharts/danm-networks/templates/danm.yaml
@@ -0,0 +1,55 @@
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################
+{{- if $.Values.global }}
+{{- if $.Values.global.danm_networks }}
+{{- range keys $.Values.global.danm_networks }}
+{{- with index $.Values.global.danm_networks . }}
+---
+apiVersion: danm.k8s.io/v1
+kind: ClusterNetwork
+metadata:
+  name: {{.name}}
+spec:
+  NetworkID: {{.network_id}}
+  NetworkType: {{.network_type}}
+{{- if ne .name "default" }}
+  Options:
+    cidr: {{.cidr}}
+    allocation_pool:
+      start: {{.allocation_pool.start}}
+      end: {{.allocation_pool.end}}
+{{- if .routes }}
+    routes:
+{{- range $subnet, $route := .routes }}
+      {{ $subnet | quote }}: {{ $route | quote }}
+{{- end }}
+{{- end }}
+{{- if .net6 }}
+    net6: {{ .net6 }}
+{{- end }}
+{{- if .routes }}
+    routes6:
+{{- range $subnet, $route := .routes6 }}
+      {{ $subnet | quote }}: {{ $route | quote }}
+{{- end }}
+{{- end }}
+    host_device: {{ .host_device }}
+    rt_tables: {{ .rt_tables }}
+    vlan: {{ .vlan }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}

diff --git a/ric-aux/helm/infrastructure/subcharts/danm-networks/values.yaml b/ric-aux/helm/infrastructure/subcharts/danm-networks/values.yaml
new file mode 100644 (file)
index 0000000..9d5a116
--- /dev/null
+++ b/ric-aux/helm/infrastructure/subcharts/danm-networks/values.yaml
@@ -0,0 +1,14 @@
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#                                                                              #
+#   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.                                             #
+################################################################################

diff --git a/ric-dep b/ric-dep
index 98d784e..1d417dc 160000 (submodule)
--- a/ric-dep
+++ b/ric-dep
@@ -1 +1 @@
-Subproject commit 98d784eba3506478481d5a22edbee6ca0bdb68da
+Subproject commit 1d417dcc634d51b240f373773698f46eeef77e84