Merge "[CORD-3003] Make XOS GUI optional (enabled by default)"
diff --git a/.gitignore b/.gitignore
index 2545b5a..743e4fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,10 @@
-xos-profiles/rcord-lite/charts/*
-xos-profiles/rcord-lite/requirements.lock
\ No newline at end of file
+# local chart repo
+chart_repo
+
+# lockfiles for requirements.yaml for dependent charts
+requirements.lock
+
+# ignore dependent chart dirs
+voltha/charts
+xos-profiles/rcord-lite/charts
+
diff --git a/configs/onos-cord.yaml b/configs/onos-cord.yaml
new file mode 100644
index 0000000..764f143
--- /dev/null
+++ b/configs/onos-cord.yaml
@@ -0,0 +1,23 @@
+---
+
+# Copyright 2018-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.
+
+# Parameters for running ONOS with VTN
+#
+# helm install -f configs/onos-cord.yaml onos
+
+# VTN is not working with 1.13 at present
+image:
+ tag: 1.12.0
diff --git a/examples/openstack-compute-tosca.yaml b/examples/openstack-compute-tosca.yaml
deleted file mode 100644
index 02951dd..0000000
--- a/examples/openstack-compute-tosca.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-
-# Copyright 2018-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.
-
-# TOSCA recipe for adding a sample R-CORD subscriber
-#
-# http POST $(minikube service xos-tosca --url)/run \
-# xos-username:admin@opencord.org xos-password:letmein \
-# @./openstack-compute-tosca.yaml
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/deployment.yaml
- - custom_types/node.yaml
- - custom_types/site.yaml
- - custom_types/sitedeployment.yaml
-
-description: Adds OpenStack compute nodes
-
-topology_template:
- node_templates:
-
-# Site/Deployment, fully defined in deployment.yaml
- mysite:
- type: tosca.nodes.Site
- properties:
- name: mysite
- must-exist: true
-
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: MyDeployment
- must-exist: true
-
-# OpenStack compute nodes
-
- head1:
- type: tosca.nodes.Node
- properties:
- name: head1
- requirements:
- - site_deployment:
- node: mysite_MyDeployment
- relationship: tosca.relationships.BelongsToOne
- compute1:
- type: tosca.nodes.Node
- properties:
- name: compute1
- requirements:
- - site_deployment:
- node: mysite_MyDeployment
- relationship: tosca.relationships.BelongsToOne
- compute2:
- type: tosca.nodes.Node
- properties:
- name: compute2
- requirements:
- - site_deployment:
- node: mysite_MyDeployment
- relationship: tosca.relationships.BelongsToOne
-
- mysite_MyDeployment:
- type: tosca.nodes.SiteDeployment
- requirements:
- - site:
- node: mysite
- relationship: tosca.relationships.BelongsToOne
- - deployment:
- node: MyDeployment
- relationship: tosca.relationships.BelongsToOne
-
diff --git a/examples/openstack-instance-tosca.yaml b/examples/openstack-instance-tosca.yaml
index 3f2ec6c..7c9c941 100644
--- a/examples/openstack-instance-tosca.yaml
+++ b/examples/openstack-instance-tosca.yaml
@@ -36,16 +36,16 @@
node_templates:
# Images and flavors
- Cirros-0.3.5:
+ Ubuntu-14.04:
type: tosca.nodes.Image
properties:
- name: "Cirros 0.3.5 64-bit"
+ name: "Ubuntu 14.04 64-bit"
must-exist: true
- m1.tiny:
+ m1.small:
type: tosca.nodes.Flavor
properties:
- name: m1.tiny
+ name: m1.small
must-exist: true
MyDeployment:
@@ -74,13 +74,13 @@
name: test_instance
requirements:
- image:
- node: Cirros-0.3.5
+ node: Ubuntu-14.04
relationship: tosca.relationships.BelongsToOne
- deployment:
node: MyDeployment
relationship: tosca.relationships.BelongsToOne
- flavor:
- node: m1.tiny
+ node: m1.small
relationship: tosca.relationships.BelongsToOne
- slice:
node: mysite_test
diff --git a/examples/openstack-tosca.yaml b/examples/openstack-tosca.yaml
deleted file mode 100644
index a2b8a5b..0000000
--- a/examples/openstack-tosca.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
----
-
-# Copyright 2018-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.
-
-# TOSCA recipe for adding a sample R-CORD subscriber
-#
-# http POST $(minikube service xos-tosca --url)/run \
-# xos-username:admin@opencord.org xos-password:letmein \
-# @./openstack-tosca.yaml
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/controller.yaml
- - custom_types/controllersite.yaml
- - custom_types/deployment.yaml
- - custom_types/flavor.yaml
- - custom_types/image.yaml
- - custom_types/site.yaml
- - custom_types/networktemplate.yaml
- - custom_types/network.yaml
- - custom_types/networkslice.yaml
- - custom_types/slice.yaml
- - custom_types/sitedeployment.yaml
-
-description: openstack extensions to deployment
-
-topology_template:
- node_templates:
-
-# Images and flavors
- Cirros-0.3.5:
- type: tosca.nodes.Image
- properties:
- name: "Cirros 0.3.5 64-bit"
- disk_format: QCOW2
- container_format: BARE
-
- m1.tiny:
- type: tosca.nodes.Flavor
- properties:
- name: m1.tiny
-
- m1.small:
- type: tosca.nodes.Flavor
- properties:
- name: m1.small
-
- m1.medium:
- type: tosca.nodes.Flavor
- properties:
- name: m1.medium
-
- m1.large:
- type: tosca.nodes.Flavor
- properties:
- name: m1.large
-
- m1.xlarge:
- type: tosca.nodes.Flavor
- properties:
- name: m1.xlarge
-
-
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: MyDeployment
-
-# OpenStack Controller
- mysite_MyDeployment_openstack:
- type: tosca.nodes.Controller
- requirements:
- - deployment:
- node: MyDeployment
- relationship: tosca.relationships.BelongsToOne
- properties:
- name: mysite_MyDeployment_openstack
- backend_type: OpenStack
- version: Newton
- auth_url: http://keystone.openstack.svc.cluster.local/v3
- admin_user: admin
- admin_password: password
- admin_tenant: admin
- domain: Default
-
-# Site - adds openstack controller to site defined in deployment.yaml
- mysite:
- type: tosca.nodes.Site
- properties:
- name: mysite
- must-exist: true
- site_url: http://mysite.opencloud.us/
- hosts_nodes: true
-
- mysite_deployment_MyDeployment:
- type: tosca.nodes.SiteDeployment
- requirements:
- - site:
- node: mysite
- relationship: tosca.relationships.BelongsToOne
- - deployment:
- node: MyDeployment
- relationship: tosca.relationships.BelongsToOne
- - controller:
- node: mysite_MyDeployment_openstack
- relationship: tosca.relationships.BelongsToOne
-
- mysite_openstack_controller:
- type: tosca.nodes.ControllerSite
- requirements:
- - site:
- node: mysite
- relationship: tosca.relationships.BelongsToOne
- - controller:
- node: mysite_MyDeployment_openstack
- relationship: tosca.relationships.BelongsToOne
-
-
-# For creating a test VM
- mysite_test:
- description: Test Slice
- type: tosca.nodes.Slice
- properties:
- # network: noauto
- name: mysite_test
- requirements:
- - site:
- node: mysite
- relationship: tosca.relationships.BelongsToOne
- - default_image:
- node: Cirros-0.3.5
- relationship: tosca.relationships.BelongsToOne
-
-
-# For private networks (e.g., per-slice)
- private_template:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: Private
- visibility: private
- translation: none
- vtn_kind: PRIVATE
diff --git a/onos/values.yaml b/onos/values.yaml
index 360f4d6..601e46d 100644
--- a/onos/values.yaml
+++ b/onos/values.yaml
@@ -22,7 +22,7 @@
image:
repository: onosproject/onos
- tag: 1.13.0
+ tag: 1.13.1
pullPolicy: IfNotPresent
nameOverride: ""
diff --git a/scripts/helmrepo.sh b/scripts/helmrepo.sh
new file mode 100755
index 0000000..e32f546
--- /dev/null
+++ b/scripts/helmrepo.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+# Copyright 2018-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.
+
+# helmrepo.sh
+# creates a helm repo for publishing on guide website
+
+set -e -u -o pipefail
+
+REPO_DIR="${REPO_DIR:-chart_repo}"
+
+GERRIT_BRANCH="${GERRIT_BRANCH:-$(git symbolic-ref --short HEAD)}"
+PUBLISH_URL="${PUBLISH_URL:-https://guide.opencord.org/charts/${GERRIT_BRANCH}}"
+
+mkdir -p "${REPO_DIR}"
+
+for chart in $(find . -name Chart.yaml -print) ; do
+
+ chartdir=$(dirname "${chart}")
+
+ echo "Adding ${chartdir}"
+
+ helm package --dependency-update --destination "${REPO_DIR}" "${chartdir}"
+
+done
+
+echo "Generating repo index"
+
+helm repo index "${REPO_DIR}" --url "${PUBLISH_URL}"
+
+echo "Finished, chart repo generated: ${REPO_DIR}"
+
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 54d5f26..66130f5 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -40,7 +40,7 @@
xosAdminLastname: 'Admin'
# CORD site names
-cordSiteName: placeholder-sitename
+cordSiteName: mysite
# Database name/username/password
xosDBName: 'xos'
diff --git a/xos-profiles/base-openstack/.helmignore b/xos-profiles/base-openstack/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/xos-profiles/base-openstack/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/xos-profiles/base-openstack/Chart.yaml b/xos-profiles/base-openstack/Chart.yaml
new file mode 100644
index 0000000..e6003da
--- /dev/null
+++ b/xos-profiles/base-openstack/Chart.yaml
@@ -0,0 +1,21 @@
+---
+
+# Copyright 2018-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.
+
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for the "base-openstack" profile
+name: base-openstack
+version: 0.1.0
diff --git a/xos-profiles/base-openstack/requirements.yaml b/xos-profiles/base-openstack/requirements.yaml
new file mode 100644
index 0000000..e0705b4
--- /dev/null
+++ b/xos-profiles/base-openstack/requirements.yaml
@@ -0,0 +1,26 @@
+---
+
+# Copyright 2018-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.
+
+dependencies:
+- name: onos-service
+ version: 0.1.0
+ repository: file://../../xos-services/onos-service
+- name: openstack
+ version: 0.1.0
+ repository: file://../../xos-services/openstack
+- name: vtn-service
+ version: 0.1.0
+ repository: file://../../xos-services/vtn-service
diff --git a/xos-profiles/base-openstack/templates/_helpers.tpl b/xos-profiles/base-openstack/templates/_helpers.tpl
new file mode 100644
index 0000000..66a8e2d
--- /dev/null
+++ b/xos-profiles/base-openstack/templates/_helpers.tpl
@@ -0,0 +1,64 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2018-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.
+*/}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "base-openstack.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "base-openstack.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "base-openstack.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+The R-CORD synchronizer loads R-CORD-specific models into the core
+*/}}
+
+{{- define "rcord.serviceConfig" -}}
+name: rcord
+accessor:
+ username: {{ .Values.xosAdminUser | quote }}
+ password: {{ .Values.xosAdminPassword | quote }}
+ endpoint: xos-core:50051
+dependency_graph: "/opt/xos/synchronizers/rcord/model-deps"
+sys_dir: "/opt/xos/synchronizers/rcord/sys"
+models_dir: "/opt/xos/synchronizers/rcord/models"
+model_policies_dir: "/opt/xos/synchronizers/rcord/model_policies"
+{{- end -}}
+
diff --git a/xos-profiles/base-openstack/templates/tosca-configmap.yaml b/xos-profiles/base-openstack/templates/tosca-configmap.yaml
new file mode 100644
index 0000000..3d7edf8
--- /dev/null
+++ b/xos-profiles/base-openstack/templates/tosca-configmap.yaml
@@ -0,0 +1,28 @@
+---
+
+# Copyright 2018-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.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: base-openstack-tosca
+data:
+ 010-openstack.yaml: |
+{{ toYaml .Values.toscaRecipes.openstack | indent 4 }}
+ 020-openstack-compute.yaml: |
+{{ toYaml .Values.toscaRecipes.openstackCompute | indent 4 }}
+ 030-vtn-service.yaml: |
+{{ toYaml .Values.toscaRecipes.vtnService | indent 4 }}
+
diff --git a/xos-profiles/base-openstack/templates/tosca-deployment.yaml b/xos-profiles/base-openstack/templates/tosca-deployment.yaml
new file mode 100644
index 0000000..a4392a9
--- /dev/null
+++ b/xos-profiles/base-openstack/templates/tosca-deployment.yaml
@@ -0,0 +1,61 @@
+---
+
+# Copyright 2018-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.
+
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+ name: {{ template "base-openstack.fullname" . }}-tosca-loader
+ labels:
+ app: {{ template "base-openstack.name" . }}
+ chart: {{ template "base-openstack.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ template "base-openstack.name" . }}
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ template "base-openstack.name" . }}
+ release: {{ .Release.Name }}
+ annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/tosca-configmap.yaml") . | sha256sum }}
+ spec:
+ containers:
+ - name: {{ .Chart.Name }}-tosca-loader
+ image: {{ .Values.httpieImage | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
+ command: ["/bin/sh"]
+ args:
+ - "-c"
+ - |
+ for recipe in /opt/tosca/*
+ do
+ echo $recipe
+ http --check-status --ignore-stdin POST http://xos-tosca:$XOS_TOSCA_SERVICE_PORT/run xos-username:{{ .Values.xosAdminUser }} xos-password:{{ .Values.xosAdminPassword }} @$recipe || exit 1
+ echo ''
+ done
+ sleep 3600
+ volumeMounts:
+ - name: base-openstack-tosca
+ mountPath: /opt/tosca
+ volumes:
+ - name: base-openstack-tosca
+ configMap:
+ name: base-openstack-tosca
diff --git a/xos-profiles/base-openstack/values.yaml b/xos-profiles/base-openstack/values.yaml
new file mode 100644
index 0000000..c16cf66
--- /dev/null
+++ b/xos-profiles/base-openstack/values.yaml
@@ -0,0 +1,360 @@
+---
+# Copyright 2018-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.
+
+# Default values for the base-openstack profile.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+nameOverride: ""
+fullnameOverride: ""
+
+imagePullPolicy: 'IfNotPresent'
+
+httpieImage: "clue/httpie:latest"
+
+xosAdminUser: &adminuser "admin@opencord.org"
+xosAdminPassword: &adminpass "letmein"
+
+# TOSCA recipes for the tosca-loader
+toscaRecipes:
+ openstack:
+ tosca_definitions_version: tosca_simple_yaml_1_0
+
+ imports:
+ - custom_types/controller.yaml
+ - custom_types/controllersite.yaml
+ - custom_types/deployment.yaml
+ - custom_types/flavor.yaml
+ - custom_types/image.yaml
+ - custom_types/site.yaml
+ - custom_types/networktemplate.yaml
+ - custom_types/network.yaml
+ - custom_types/networkslice.yaml
+ - custom_types/slice.yaml
+ - custom_types/sitedeployment.yaml
+
+ description: openstack extensions to deployment
+
+ topology_template:
+ node_templates:
+
+ # Images and flavors
+ Ubuntu-14.04:
+ type: tosca.nodes.Image
+ properties:
+ name: "Ubuntu 14.04 64-bit"
+ disk_format: QCOW2
+ container_format: BARE
+ path: https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201
+
+ m1.tiny:
+ type: tosca.nodes.Flavor
+ properties:
+ name: m1.tiny
+
+ m1.small:
+ type: tosca.nodes.Flavor
+ properties:
+ name: m1.small
+
+ m1.medium:
+ type: tosca.nodes.Flavor
+ properties:
+ name: m1.medium
+
+ m1.large:
+ type: tosca.nodes.Flavor
+ properties:
+ name: m1.large
+
+ m1.xlarge:
+ type: tosca.nodes.Flavor
+ properties:
+ name: m1.xlarge
+
+ MyDeployment:
+ type: tosca.nodes.Deployment
+ properties:
+ name: MyDeployment
+
+ # OpenStack Controller
+ mysite_MyDeployment_openstack:
+ type: tosca.nodes.Controller
+ requirements:
+ - deployment:
+ node: MyDeployment
+ relationship: tosca.relationships.BelongsToOne
+ properties:
+ name: mysite_MyDeployment_openstack
+ backend_type: OpenStack
+ version: Newton
+ auth_url: http://keystone.openstack.svc.cluster.local/v3
+ admin_user: admin
+ admin_password: password
+ admin_tenant: admin
+ domain: Default
+
+ # Site - adds openstack controller to site defined in deployment.yaml
+ mysite:
+ type: tosca.nodes.Site
+ properties:
+ name: mysite
+ must-exist: true
+ site_url: http://mysite.opencloud.us/
+ hosts_nodes: true
+
+ mysite_deployment_MyDeployment:
+ type: tosca.nodes.SiteDeployment
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.BelongsToOne
+ - deployment:
+ node: MyDeployment
+ relationship: tosca.relationships.BelongsToOne
+ - controller:
+ node: mysite_MyDeployment_openstack
+ relationship: tosca.relationships.BelongsToOne
+
+ mysite_openstack_controller:
+ type: tosca.nodes.ControllerSite
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.BelongsToOne
+ - controller:
+ node: mysite_MyDeployment_openstack
+ relationship: tosca.relationships.BelongsToOne
+
+ # For creating a test VM
+ mysite_test:
+ description: Test Slice
+ type: tosca.nodes.Slice
+ properties:
+ # network: noauto
+ name: mysite_test
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.BelongsToOne
+ - default_image:
+ node: Ubuntu-14.04
+ relationship: tosca.relationships.BelongsToOne
+
+ # For private networks (e.g., per-slice)
+ private_template:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ name: Private
+ visibility: private
+ translation: none
+ vtn_kind: PRIVATE
+
+ # management (vtn: MANAGEMENT_LOCAL) network
+ management_template:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ name: management_template
+ visibility: private
+ translation: none
+ vtn_kind: MANAGEMENT_LOCAL
+
+ management:
+ type: tosca.nodes.Network
+ properties:
+ name: management
+ # ip_version: 4
+ subnet: 172.27.0.0/24
+ permit_all_slices: true
+ requirements:
+ - template:
+ node: management_template
+ relationship: tosca.relationships.BelongsToOne
+ - owner:
+ node: slice#mysite_management
+ relationship: tosca.relationships.BelongsToOne
+
+ # Slice to own management networks
+ slice#mysite_management:
+ description: This slice exists solely to own the management network(s)
+ type: tosca.nodes.Slice
+ properties:
+ network: noauto
+ name: mysite_management
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.BelongsToOne
+
+ # Connect mysite_test to management net
+ networkslice#management_to_mysite_test:
+ type: tosca.nodes.NetworkSlice
+ requirements:
+ - network:
+ node: management
+ relationship: tosca.relationships.BelongsToOne
+ - slice:
+ node: mysite_test
+ relationship: tosca.relationships.BelongsToOne
+ openstackCompute:
+ tosca_definitions_version: tosca_simple_yaml_1_0
+
+ imports:
+ - custom_types/deployment.yaml
+ - custom_types/node.yaml
+ - custom_types/site.yaml
+ - custom_types/sitedeployment.yaml
+
+ description: Adds OpenStack compute nodes
+
+ topology_template:
+ node_templates:
+
+ # Site/Deployment, fully defined in deployment.yaml
+ mysite:
+ type: tosca.nodes.Site
+ properties:
+ name: mysite
+ must-exist: true
+
+ MyDeployment:
+ type: tosca.nodes.Deployment
+ properties:
+ name: MyDeployment
+ must-exist: true
+
+ mysite_MyDeployment:
+ type: tosca.nodes.SiteDeployment
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.BelongsToOne
+ - deployment:
+ node: MyDeployment
+ relationship: tosca.relationships.BelongsToOne
+
+ # OpenStack compute nodes
+
+ head1:
+ type: tosca.nodes.Node
+ properties:
+ name: head1
+ bridgeId: of:00000000abcdef01
+ dataPlaneIntf: fabricbridge
+ dataPlaneIp: 10.6.1.1/24
+ requirements:
+ - site_deployment:
+ node: mysite_MyDeployment
+ relationship: tosca.relationships.BelongsToOne
+
+ compute1:
+ type: tosca.nodes.Node
+ properties:
+ name: compute1
+ bridgeId: of:00000000abcdef02
+ dataPlaneIntf: fabricbond
+ dataPlaneIp: 10.6.1.17/24
+ requirements:
+ - site_deployment:
+ node: mysite_MyDeployment
+ relationship: tosca.relationships.BelongsToOne
+
+ compute2:
+ type: tosca.nodes.Node
+ properties:
+ name: compute2
+ bridgeId: of:00000000abcdef03
+ dataPlaneIntf: fabricbond
+ dataPlaneIp: 10.6.1.18/24
+ requirements:
+ - site_deployment:
+ node: mysite_MyDeployment
+ relationship: tosca.relationships.BelongsToOne
+
+ vtnService:
+ tosca_definitions_version: tosca_simple_yaml_1_0
+
+ imports:
+ - custom_types/onosapp.yaml
+ - custom_types/onosservice.yaml
+ - custom_types/serviceinstanceattribute.yaml
+ - custom_types/serviceinstancelink.yaml
+ - custom_types/vtnservice.yaml
+
+ description: Configures the VTN ONOS service
+
+ topology_template:
+ node_templates:
+
+ service#ONOS_CORD:
+ type: tosca.nodes.ONOSService
+ properties:
+ name: ONOS_CORD
+ kind: platform
+ no_container: true
+ rest_hostname: onos-cord-ui
+ rest_port: 8181
+
+ service#vtn:
+ type: tosca.nodes.VTNService
+ properties:
+ name: vtn
+ kind: platform
+ view_url: /admin/vtn/vtnservice/$id$/
+ privateGatewayMac: 00:00:00:00:00:01
+ localManagementIp: 172.27.0.1/24
+ ovsdbPort: 6641
+ sshUser: vagrant
+ sshKeyFile: /root/node_key
+ sshPort: 22
+ xosEndpoint: xos-chameleon:9101
+ xosUser: *adminuser
+ xosPassword: *adminpass
+ vtnAPIVersion: 2
+ controllerPort: onos-cord-openflow:6653
+ resync: false
+
+ VTN_ONOS_app:
+ type: tosca.nodes.ONOSApp
+ requirements:
+ - owner:
+ node: service#ONOS_CORD
+ relationship: tosca.relationships.BelongsToOne
+ properties:
+ name: VTN_ONOS_app
+ install_dependencies: https://repo.maven.apache.org/maven2/org/opencord/cord-config/1.3.1/cord-config-1.3.1.oar, https://repo.maven.apache.org/maven2/org/opencord/vtn/1.5.0/vtn-1.5.0.oar
+ dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
+
+ VTN_ONOS_app_autogenerate:
+ type: tosca.nodes.ServiceInstanceAttribute
+ requirements:
+ - service_instance:
+ node: VTN_ONOS_app
+ relationship: tosca.relationships.BelongsToOne
+ properties:
+ name: autogenerate
+ value: vtn-network-cfg
+
+ VTN_ONOS_app_VTN_Service:
+ type: tosca.nodes.ServiceInstanceLink
+ requirements:
+ - provider_service_instance:
+ node: VTN_ONOS_app
+ relationship: tosca.relationships.BelongsToOne
+ - subscriber_service:
+ node: service#vtn
+ relationship: tosca.relationships.BelongsToOne