[CORD-1509] create hss service
Change-Id: I36994774a0426860feb0596104a767f7a54fc48b
diff --git a/xos/admin.py b/xos/admin.py
new file mode 100644
index 0000000..a9ac2df
--- /dev/null
+++ b/xos/admin.py
@@ -0,0 +1,116 @@
+# admin.py - ExampleService Django Admin
+
+from core.admin import ReadOnlyAwareAdmin, SliceInline
+from core.middleware import get_request
+from core.models import User
+
+from django import forms
+from django.contrib import admin
+
+from services.vhss.models import *
+
+class VHSSServiceForm(forms.ModelForm):
+
+ class Meta:
+ model = VHSSService
+ fields = '__all__'
+
+ def __init__(self, *args, **kwargs):
+ super(VHSSServiceForm, self).__init__(*args, **kwargs)
+
+ if self.instance:
+ self.fields['service_message'].initial = self.instance.service_message
+
+ def save(self, commit=True):
+ self.instance.service_message = self.cleaned_data.get('service_message')
+ return super(VHSSServiceForm, self).save(commit=commit)
+
+class VHSSServiceAdmin(ReadOnlyAwareAdmin):
+
+ model = VHSSService
+ verbose_name = "vHSS Service"
+ verbose_name_plural = "vHSS Services"
+ inlines = [SliceInline]
+
+ list_display = ('backend_status_icon', 'name', 'service_message', 'enabled')
+ list_display_links = ('backend_status_icon', 'name', 'service_message' )
+
+ fieldsets = [(None, {
+ 'fields': ['backend_status_text', 'name', 'enabled', 'versionNumber', 'service_message', 'description',],
+ 'classes':['suit-tab suit-tab-general',],
+ })]
+
+ readonly_fields = ('backend_status_text', )
+ user_readonly_fields = ['name', 'enabled', 'versionNumber', 'description',]
+
+ extracontext_registered_admins = True
+
+ suit_form_tabs = (
+ ('general', 'Example Service Details', ),
+ ('slices', 'Slices',),
+ )
+
+ suit_form_includes = ((
+ 'top',
+ 'administration'),
+ )
+
+ def get_queryset(self, request):
+ return VHSSService.get_service_objects_by_user(request.user)
+
+admin.site.register(VHSSService, VHSSServiceAdmin)
+
+class VHSSTenantForm(forms.ModelForm):
+
+ class Meta:
+ model = VHSSTenant
+ fields = '__all__'
+
+ creator = forms.ModelChoiceField(queryset=User.objects.all())
+
+ def __init__(self, *args, **kwargs):
+ super(VHSSTenantForm, self).__init__(*args, **kwargs)
+
+ self.fields['kind'].widget.attrs['readonly'] = True
+ self.fields['kind'].initial = "vhss"
+
+ self.fields['provider_service'].queryset = VHSSService.get_service_objects().all()
+
+ if self.instance:
+ self.fields['creator'].initial = self.instance.creator
+ self.fields['tenant_message'].initial = self.instance.tenant_message
+
+ if (not self.instance) or (not self.instance.pk):
+ self.fields['creator'].initial = get_request().user
+ if VHSSService.get_service_objects().exists():
+ self.fields['provider_service'].initial = VHSSService.get_service_objects().all()[0]
+
+ def save(self, commit=True):
+ self.instance.creator = self.cleaned_data.get('creator')
+ self.instance.tenant_message = self.cleaned_data.get('tenant_message')
+ return super(VHSSTenantForm, self).save(commit=commit)
+
+
+class ExampleTenantAdmin(ReadOnlyAwareAdmin):
+
+ verbose_name = "vHSS Service Tenant"
+ verbose_name_plural = "vHSS Service Tenants"
+
+ list_display = ('id', 'backend_status_icon', 'instance', 'tenant_message')
+ list_display_links = ('backend_status_icon', 'instance', 'tenant_message', 'id')
+
+ fieldsets = [(None, {
+ 'fields': ['backend_status_text', 'kind', 'provider_service', 'instance', 'creator', 'tenant_message'],
+ 'classes': ['suit-tab suit-tab-general'],
+ })]
+
+ readonly_fields = ('backend_status_text', 'instance',)
+
+
+ suit_form_tabs = (('general', 'Details'),)
+
+ def get_queryset(self, request):
+ return VHSSTenant.get_tenant_objects_by_user(request.user)
+
+admin.site.register(VHSSTenant, VHSSTenantAdmin)
+
diff --git a/xos/macros.m4 b/xos/macros.m4
new file mode 100644
index 0000000..1f48f10
--- /dev/null
+++ b/xos/macros.m4
@@ -0,0 +1,84 @@
+# Note: Tosca derived_from isn't working the way I think it should, it's not
+# inheriting from the parent template. Until we get that figured out, use
+# m4 macros do our inheritance
+
+define(xos_base_props,
+ no-delete:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to delete this object
+ no-create:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object
+ replaces:
+ type: string
+ required: false
+ descrption: Replaces/renames this object)
+# Service
+define(xos_base_service_caps,
+ scalable:
+ type: tosca.capabilities.Scalable
+ service:
+ type: tosca.capabilities.xos.Service)
+define(xos_base_service_props,
+ kind:
+ type: string
+ default: generic
+ description: Type of service.
+ view_url:
+ type: string
+ required: false
+ description: URL to follow when icon is clicked in the Service Directory.
+ icon_url:
+ type: string
+ required: false
+ description: ICON to display in the Service Directory.
+ enabled:
+ type: boolean
+ default: true
+ published:
+ type: boolean
+ default: true
+ description: If True then display this Service in the Service Directory.
+ public_key:
+ type: string
+ required: false
+ description: Public key to install into Instances to allows Services to SSH into them.
+ private_key_fn:
+ type: string
+ required: false
+ description: Location of private key file
+ versionNumber:
+ type: string
+ required: false
+ description: Version number of Service.)
+# Subscriber
+define(xos_base_subscriber_caps,
+ subscriber:
+ type: tosca.capabilities.xos.Subscriber)
+define(xos_base_subscriber_props,
+ kind:
+ type: string
+ default: generic
+ description: Kind of subscriber
+ service_specific_id:
+ type: string
+ required: false
+ description: Service specific ID opaque to XOS but meaningful to service)
+define(xos_base_tenant_props,
+ kind:
+ type: string
+ default: generic
+ description: Kind of tenant
+ service_specific_id:
+ type: string
+ required: false
+ description: Service specific ID opaque to XOS but meaningful to service)
+
+# end m4 macros
+
diff --git a/xos/make_synchronizer_manifest.sh b/xos/make_synchronizer_manifest.sh
new file mode 100755
index 0000000..4058982
--- /dev/null
+++ b/xos/make_synchronizer_manifest.sh
@@ -0,0 +1,2 @@
+#! /bin/bash
+find synchronizer -type f | cut -b 14- > synchronizer/manifest
diff --git a/xos/models.py b/xos/models.py
new file mode 100644
index 0000000..f36af40
--- /dev/null
+++ b/xos/models.py
@@ -0,0 +1,64 @@
+# models.py - VHSSService Models
+
+from core.models import Service, TenantWithContainer, Image
+from django.db import models, transaction
+
+MCORD_KIND = "EPC" # added from vBBU
+
+# these macros are currently not used, names hard-coded manually
+SERVICE_NAME = 'vhss'
+SERVICE_NAME_VERBOSE = 'VHSS Service'
+SERVICE_NAME_VERBOSE_PLURAL = 'VHSS Services'
+TENANT_NAME_VERBOSE = 'VHSS Service Tenant'
+TENANT_NAME_VERBOSE_PLURAL = 'VHSS Service Tenants'
+
+
+class VHSSService(Service):
+ KIND = MCORD_KIND
+
+ class Meta:
+ proxy = True
+ app_label = "vhss"
+ verbose_name = "VHSS Service"
+
+
+class VHSSTenant(TenantWithContainer):
+ KIND = 'vhss'
+
+ class Meta:
+ verbose_name = "VHSS Service Tenant"
+
+ tenant_message = models.CharField(max_length=254, help_text="vHSS message")
+ image_name = models.CharField(max_length=254, help_text="Name of VM image")
+
+ def __init__(self, *args, **kwargs):
+ vhss_services = VHSSService.get_service_objects().all()
+ if vhss_services:
+ self._meta.get_field('provider_service').default = vhss_services[0].id
+ super(VHSSTenant, self).__init__(*args, **kwargs)
+
+ def save(self, *args, **kwargs):
+ super(VHSSTenant, self).save(*args, **kwargs)
+ model_policy_vhsstenant(self.pk) # defined below
+
+ def delete(self, *args, **kwargs):
+ self.cleanup_container()
+ super(VHSSTenant, self).delete(*args, **kwargs)
+
+ @property
+ def image(self):
+ img = self.image_name.strip()
+ if img.lower() != "default":
+ return Image.objects.get(name=img)
+ else:
+ return super(VHSSTenant, self).image
+
+
+def model_policy_vhsstenant(pk):
+ with transaction.atomic():
+ tenant = VHSSTenant.objects.select_for_update().filter(pk=pk)
+ if not tenant:
+ return
+ tenant = tenant[0]
+ tenant.manage_container()
+
diff --git a/xos/synchronizer/Dockerfile.synchronizer b/xos/synchronizer/Dockerfile.synchronizer
new file mode 100644
index 0000000..bc6eae8
--- /dev/null
+++ b/xos/synchronizer/Dockerfile.synchronizer
@@ -0,0 +1,39 @@
+FROM xosproject/xos-synchronizer-base:candidate
+
+COPY . /opt/xos/synchronizers/vhss
+
+ENTRYPOINT []
+
+WORKDIR "/opt/xos/synchronizers/vhss"
+
+# Label image
+ARG org_label_schema_schema_version=1.0
+ARG org_label_schema_name=vhss-synchronizer
+ARG org_label_schema_version=unknown
+ARG org_label_schema_vcs_url=unknown
+ARG org_label_schema_vcs_ref=unknown
+ARG org_label_schema_build_date=unknown
+ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_component_chameleon_version=unknown
+ARG org_opencord_component_chameleon_vcs_url=unknown
+ARG org_opencord_component_chameleon_vcs_ref=unknown
+ARG org_opencord_component_xos_version=unknown
+ARG org_opencord_component_xos_vcs_url=unknown
+ARG org_opencord_component_xos_vcs_ref=unknown
+
+LABEL org.label-schema.schema-version=$org_label_schema_schema_version \
+ org.label-schema.name=$org_label_schema_name \
+ org.label-schema.version=$org_label_schema_version \
+ org.label-schema.vcs-url=$org_label_schema_vcs_url \
+ org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
+ org.label-schema.build-date=$org_label_schema_build_date \
+ org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+ org.opencord.component.chameleon.version=$org_opencord_component_chameleon_version \
+ org.opencord.component.chameleon.vcs-url=$org_opencord_component_chameleon_vcs_url \
+ org.opencord.component.chameleon.vcs-ref=$org_opencord_component_chameleon_vcs_ref \
+ org.opencord.component.xos.version=$org_opencord_component_xos_version \
+ org.opencord.component.xos.vcs-url=$org_opencord_component_xos_vcs_url \
+ org.opencord.component.xos.vcs-ref=$org_opencord_component_xos_vcs_ref
+
+CMD bash -c "cd /opt/xos/synchronizers/vhss; ./run-from-api.sh"
+
diff --git a/xos/synchronizer/model-deps b/xos/synchronizer/model-deps
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/xos/synchronizer/model-deps
@@ -0,0 +1 @@
+{}
diff --git a/xos/synchronizer/run-from-api.sh b/xos/synchronizer/run-from-api.sh
new file mode 100755
index 0000000..3928852
--- /dev/null
+++ b/xos/synchronizer/run-from-api.sh
@@ -0,0 +1 @@
+python vhss-synchronizer.py
diff --git a/xos/synchronizer/steps/monitoring_agent.yaml b/xos/synchronizer/steps/monitoring_agent.yaml
new file mode 100644
index 0000000..08b1fe7
--- /dev/null
+++ b/xos/synchronizer/steps/monitoring_agent.yaml
@@ -0,0 +1,61 @@
+---
+- hosts: {{ instance_name }}
+ gather_facts: False
+ connection: ssh
+ user: ubuntu
+ vars:
+ keystone_tenant_id: {{ keystone_tenant_id }}
+ keystone_user_id: {{ keystone_user_id }}
+ target_uri: {{ target_uri }}
+
+ tasks:
+ - name: Verify if monitoring_agent ([] is to avoid capturing the shell process) cron job is already running
+ shell: pgrep -f [m]onitoring_agent | wc -l
+ register: cron_job_pids_count
+
+ - name: DEBUG
+ debug: var=cron_job_pids_count.stdout
+
+ - name: make sure /usr/local/share/monitoring_agent exists
+ file: path=/usr/local/share/monitoring_agent state=directory owner=root group=root
+ become: yes
+ when: cron_job_pids_count.stdout == "0"
+
+ - name: Copy cron job to destination
+ copy: src=/opt/xos/synchronizers/vhss/monitoring_agent/
+ dest=/usr/local/share/monitoring_agent/
+ become: yes
+ when: cron_job_pids_count.stdout == "0"
+
+ - name: Installing python-pip
+ apt: name=python-pip state=present update_cache=yes
+ become: yes
+ when: cron_job_pids_count.stdout == "0"
+
+ - name: Installing Flask
+ pip: name=Flask
+ become: yes
+ when: cron_job_pids_count.stdout == "0"
+
+ - name: install python-kombu
+ apt: name=python-kombu state=present
+ become: yes
+ when: cron_job_pids_count.stdout == "0"
+
+ - name: Initiate monitoring agent cron job
+ command: python monitoring_agent.py &
+ async: 9999999999999999
+ poll: 0
+ become: yes
+ when: cron_job_pids_count.stdout == "0"
+ args:
+ chdir: /usr/local/share/monitoring_agent/
+
+ - name : starting monitoring agent
+ uri:
+ url: http://localhost:5004/monitoring/agent/vhss/start
+ method: POST
+ body: '{ "target":"{{target_uri}}", "keystone_user_id": "{{keystone_user_id}}", "keystone_tenant_id": "{{keystone_tenant_id}}" }'
+ force_basic_auth: yes
+ status_code: 200
+ body_format: json
diff --git a/xos/synchronizer/steps/sync_vhss.py b/xos/synchronizer/steps/sync_vhss.py
new file mode 100644
index 0000000..a222fbf
--- /dev/null
+++ b/xos/synchronizer/steps/sync_vhss.py
@@ -0,0 +1,83 @@
+import os
+import sys
+from synchronizers.new_base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
+from synchronizers.new_base.modelaccessor import *
+from xos.logger import Logger, logging
+
+parentdir = os.path.join(os.path.dirname(__file__), "..")
+sys.path.insert(0, parentdir)
+
+logger = Logger(level=logging.INFO)
+
+class SyncVHSSTenant(SyncInstanceUsingAnsible):
+
+ provides = [VHSSTenant]
+
+ observes = VHSSTenant
+
+ requested_interval = 0
+
+ template_name = "sync_vhss.yaml"
+
+ service_key_name = "/opt/xos/synchronizers/mcord/mcord_private_key"
+
+ watches = [ModelLink(ServiceDependency,via='servicedependency'), ModelLink(ServiceMonitoringAgentInfo,via='monitoringagentinfo')]
+
+ def __init__(self, *args, **kwargs):
+ super(SyncVHSSTenant, self).__init__(*args, **kwargs)
+
+ def get_vhss(self, o):
+ if not o.provider_service:
+ return None
+
+ vhss = VHSSService.objects.filter(id=o.provider_service.id)
+
+ if not vhss:
+ return None
+
+ return vhss[0]
+
+ # Gets the attributes that are used by the Ansible template but are not
+ # part of the set of default attributes.
+ def get_extra_attributes(self, o):
+ fields = {}
+ fields['tenant_message'] = o.tenant_message
+ vhss = self.get_vhss(o)
+ fields['service_message'] = vhss.service_message
+ return fields
+
+ def delete_record(self, port):
+ # Nothing needs to be done to delete an exampleservice; it goes away
+ # when the instance holding the exampleservice is deleted.
+ pass
+
+ def handle_service_monitoringagentinfo_watch_notification(self, monitoring_agent_info):
+ if not monitoring_agent_info.service:
+ logger.info("handle watch notifications for service monitoring agent info...ignoring because service attribute in monitoring agent info:%s is null" % (monitoring_agent_info))
+ return
+
+ if not monitoring_agent_info.target_uri:
+ logger.info("handle watch notifications for service monitoring agent info...ignoring because target_uri attribute in monitoring agent info:%s is null" % (monitoring_agent_info))
+ return
+
+ objs = VHSSTenant.objects.all()
+ for obj in objs:
+ if obj.provider_service.id != monitoring_agent_info.service.id:
+ logger.info("handle watch notifications for service monitoring agent info...ignoring because service attribute in monitoring agent info:%s is not matching" % (monitoring_agent_info))
+ return
+
+ instance = self.get_instance(obj)
+ if not instance:
+ logger.warn("handle watch notifications for service monitoring agent info...: No valid instance found for object %s" % (str(obj)))
+ return
+
+ logger.info("handling watch notification for monitoring agent info:%s for ExampleTenant object:%s" % (monitoring_agent_info, obj))
+
+ #Run ansible playbook to update the routing table entries in the instance
+ fields = self.get_ansible_fields(instance)
+ fields["ansible_tag"] = obj.__class__.__name__ + "_" + str(obj.id) + "_monitoring"
+ fields["target_uri"] = monitoring_agent_info.target_uri
+
+ template_name = "monitoring_agent.yaml"
+ super(SyncVHSSTenant, self).run_playbook(obj, fields, template_name)
+ pass
diff --git a/xos/synchronizer/steps/sync_vhss.yaml b/xos/synchronizer/steps/sync_vhss.yaml
new file mode 100644
index 0000000..c01980c
--- /dev/null
+++ b/xos/synchronizer/steps/sync_vhss.yaml
@@ -0,0 +1,12 @@
+---
+# exampletenant_playbook
+
+- hosts: "{{ instance_name }}"
+ connection: ssh
+ user: ubuntu
+ sudo: yes
+ gather_facts: no
+ vars:
+ - tenant_message: "{{ tenant_message }}"
+ - service_message: "{{ service_message }}"
+
diff --git a/xos/synchronizer/vhss-synchronizer.py b/xos/synchronizer/vhss-synchronizer.py
new file mode 100644
index 0000000..aafdb44
--- /dev/null
+++ b/xos/synchronizer/vhss-synchronizer.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+# Runs the standard XOS synchronizer
+
+import importlib
+import os
+import sys
+
+synchronizer_path = os.path.join(os.path.dirname(
+ os.path.realpath(__file__)), "../../synchronizers/new_base")
+sys.path.append(synchronizer_path)
+mod = importlib.import_module("xos-synchronizer")
+mod.main()
+
diff --git a/xos/synchronizer/vhss_config.yaml b/xos/synchronizer/vhss_config.yaml
new file mode 100644
index 0000000..e31350e
--- /dev/null
+++ b/xos/synchronizer/vhss_config.yaml
@@ -0,0 +1,22 @@
+# Sets options for the synchronizer
+[observer]
+name=vhss
+dependency_graph=/opt/xos/synchronizers/vhss/model-deps
+steps_dir=/opt/xos/synchronizers/vhss/steps
+sys_dir=/opt/xos/synchronizers/vhss/sys
+#logfile=/var/log/xos_backend.log
+log_file=console
+log_level=debug
+pretend=False
+backoff_disabled=True
+save_ansible_output=True
+proxy_ssh=True
+proxy_ssh_key=/opt/cord_profile/node_key
+proxy_ssh_user=root
+enable_watchers=True
+accessor_kind=api
+accessor_password=@/opt/xos/services/vhss/credentials/xosadmin@opencord.org
+required_models=VHSSService, VHSSTenant, ServiceDependency, ServiceMonitoringAgentInfo
+
+[networking]
+use_vtn=True
\ No newline at end of file
diff --git a/xos/tosca/resources/vhssservice.py b/xos/tosca/resources/vhssservice.py
new file mode 100644
index 0000000..370a008
--- /dev/null
+++ b/xos/tosca/resources/vhssservice.py
@@ -0,0 +1,9 @@
+from service import XOSService
+from services.vhss.models import VHSSService
+
+class XOSVHSSService(XOSService):
+ provides = "tosca.nodes.VHSSService"
+ xos_model = VHSSService
+ copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "private_key_fn", "versionNumber", "service_message"]
+
+
diff --git a/xos/tosca/resources/vhsstenant.py b/xos/tosca/resources/vhsstenant.py
new file mode 100644
index 0000000..0bbeec6
--- /dev/null
+++ b/xos/tosca/resources/vhsstenant.py
@@ -0,0 +1,28 @@
+from xosresource import XOSResource
+from core.models import Tenant, Service
+from services.vhss.models import * #ExampleTenant, SERVICE_NAME as EXAMPLETENANT_KIND
+
+class XOSVHSSTenant(XOSResource):
+ provides = "tosca.nodes.VHSSTenant"
+ xos_model = VHSSTenant
+ name_field = "service_specific_id"
+ copyin_props = ("tenant_message",)
+
+ def get_xos_args(self, throw_exception=True):
+ args = super(XOSVHSSTenant, self).get_xos_args()
+
+ # ExampleTenant must always have a provider_service
+ provider_name = self.get_requirement("tosca.relationships.TenantOfService", throw_exception=True)
+ if provider_name:
+ args["provider_service"] = self.get_xos_object(Service, throw_exception=True, name=provider_name)
+
+ return args
+
+ def get_existing_objs(self):
+ args = self.get_xos_args(throw_exception=False)
+ return VHSSTenant.get_tenant_objects().filter(provider_service=args["provider_service"], service_specific_id=args["service_specific_id"])
+ return []
+
+ def can_delete(self, obj):
+ return super(XOSVHSSTenant, self).can_delete(obj)
+
diff --git a/xos/vhss-onboard.yaml b/xos/vhss-onboard.yaml
new file mode 100644
index 0000000..537d8ca
--- /dev/null
+++ b/xos/vhss-onboard.yaml
@@ -0,0 +1,22 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Onboard the vHSS service
+
+imports:
+ - custom_types/xos.yaml
+
+topology_template:
+ node_templates:
+ vhss:
+ type: tosca.nodes.ServiceController
+ properties:
+ base_url: file:///opt/xos_services/vhss/xos/
+ # The following will concatenate with base_url automatically, if
+ # base_url is non-null.
+ xproto: ./
+ admin: admin.py
+ tosca_custom_types: vhss.yaml
+ tosca_resource: tosca/resources/vhssservice.py, tosca/resources/vhsstenant.py
+ private_key: file:///opt/xos/key_import/mcord_rsa
+ public_key: file:///opt/xos/key_import/mcord_rsa.pub
+
diff --git a/xos/vhss.m4 b/xos/vhss.m4
new file mode 100644
index 0000000..b36695c
--- /dev/null
+++ b/xos/vhss.m4
@@ -0,0 +1,31 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+# compile this with "m4 vhss.m4 > vhss.yaml"
+
+# include macros
+include(macros.m4)
+
+node_types:
+ tosca.nodes.VHSSService:
+ derived_from: tosca.nodes.Root
+ description: >
+ vHSS Service
+ capabilities:
+ xos_base_service_caps
+ properties:
+ xos_base_props
+ xos_base_service_props
+ service_message:
+ type: string
+ required: false
+
+ tosca.nodes.VHSSTenant:
+ derived_from: tosca.nodes.Root
+ description: >
+ A Tenant of the vHSS service
+ properties:
+ xos_base_tenant_props
+ tenant_message:
+ type: string
+ required: false
+
diff --git a/xos/vhss.xproto b/xos/vhss.xproto
new file mode 100644
index 0000000..b4d9846
--- /dev/null
+++ b/xos/vhss.xproto
@@ -0,0 +1,15 @@
+option name = "vHSS";
+option verbose_name = "VHSSService";
+
+option legacy = "True";
+
+message VHSSService (Service){
+ required string service_message = 1 [help_text = "Service Message to Display", max_length = 254, null = False, db_index = False, blank = False];
+}
+
+
+message VHSSTenant (TenantWithContainer){
+ option name = "VHSS";
+ option verbose_name = "Virtual Home Subscriber Server Tenant";
+ required string tenant_message = 1 [help_text = "Tenant Message to Display", max_length = 254, null = False, db_index = False, blank = False];
+}
diff --git a/xos/vhss.yaml b/xos/vhss.yaml
new file mode 100644
index 0000000..e11f528
--- /dev/null
+++ b/xos/vhss.yaml
@@ -0,0 +1,101 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+# compile this with "m4 vhss.m4 > vhss.yaml"
+
+# include macros
+# Note: Tosca derived_from isn't working the way I think it should, it's not
+# inheriting from the parent template. Until we get that figured out, use
+# m4 macros do our inheritance
+
+
+# Service
+
+
+# Subscriber
+
+
+
+
+# end m4 macros
+
+
+
+node_types:
+ tosca.nodes.VHSSService:
+ derived_from: tosca.nodes.Root
+ description: >
+ vHSS Service
+ capabilities:
+ scalable:
+ type: tosca.capabilities.Scalable
+ service:
+ type: tosca.capabilities.xos.Service
+ properties:
+ no-delete:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to delete this object
+ no-create:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object
+ replaces:
+ type: string
+ required: false
+ descrption: Replaces/renames this object
+ kind:
+ type: string
+ default: generic
+ description: Type of service.
+ view_url:
+ type: string
+ required: false
+ description: URL to follow when icon is clicked in the Service Directory.
+ icon_url:
+ type: string
+ required: false
+ description: ICON to display in the Service Directory.
+ enabled:
+ type: boolean
+ default: true
+ published:
+ type: boolean
+ default: true
+ description: If True then display this Service in the Service Directory.
+ public_key:
+ type: string
+ required: false
+ description: Public key to install into Instances to allows Services to SSH into them.
+ private_key_fn:
+ type: string
+ required: false
+ description: Location of private key file
+ versionNumber:
+ type: string
+ required: false
+ description: Version number of Service.
+ service_message:
+ type: string
+ required: false
+
+ tosca.nodes.VHSSTenant:
+ derived_from: tosca.nodes.Root
+ description: >
+ A Tenant of the vHSS service
+ properties:
+ kind:
+ type: string
+ default: generic
+ description: Kind of tenant
+ service_specific_id:
+ type: string
+ required: false
+ description: Service specific ID opaque to XOS but meaningful to service
+ tenant_message:
+ type: string
+ required: false
+