CORD-2945 TOSCA for VTN service
Change-Id: I5c2189992c808a27cd49f80fcae9c72152ba7dbc
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