Intergrated topology view
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index 20f997a..dcc5af2 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -5,6 +5,9 @@
sudo docker-compose up -d
bash ../common/wait_for_xos.sh
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/frontend/sample.yaml
+ # sudo docker-compose run xos python manage.py makemigrations mcordservice
+ # sudo docker-compose run xos python manage.py syncdb
+ # sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/tosca/MCORDServiceN.yaml
containers:
cd ../../../containers/xos; make devel
diff --git a/xos/configurations/frontend/docker-compose.yml b/xos/configurations/frontend/docker-compose.yml
index 2ad8f7a..45893ee 100644
--- a/xos/configurations/frontend/docker-compose.yml
+++ b/xos/configurations/frontend/docker-compose.yml
@@ -21,6 +21,7 @@
volumes:
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
- ../../core/xoslib:/opt/xos/core/xoslib
+ - ../../tosca:/opt/xos/tosca
- ../../core/static:/opt/xos/core/static
- ../../templates/admin:/opt/xos/templates/admin
- ../../configurations:/opt/xos/configurations
diff --git a/xos/tosca/MCORDServiceN.yaml b/xos/tosca/MCORDServiceN.yaml
index a5dd68e..6c60fe1 100644
--- a/xos/tosca/MCORDServiceN.yaml
+++ b/xos/tosca/MCORDServiceN.yaml
@@ -18,6 +18,148 @@
topology_template:
node_templates:
+
+ # Setup
+ trusty-server-multi-nic:
+ type: tosca.nodes.Image
+ properties:
+ disk_format: QCOW2
+ container_format: BARE
+
+ MyDeployment:
+ type: tosca.nodes.Deployment
+ properties:
+ flavors: m1.large, m1.medium, m1.small
+ requirements:
+ - image:
+ node: trusty-server-multi-nic
+ relationship: tosca.relationships.SupportsImage
+
+ CloudLab:
+ type: tosca.nodes.Controller
+ requirements:
+ - deployment:
+ node: MyDeployment
+ relationship: tosca.relationships.ControllerDeployment
+ properties:
+ backend_type: OpenStack
+ version: Juno
+ auth_url: http://sample/v2
+ admin_user: admin
+ admin_password: adminpassword
+ admin_tenant: admin
+ domain: Default
+
+ mysite:
+ type: tosca.nodes.Site
+ properties:
+ display_name: MySite
+ site_url: http://opencloud.us/
+ requirements:
+ - deployment:
+ node: MyDeployment
+ relationship: tosca.relationships.SiteDeployment
+ requirements:
+ - controller:
+ node: CloudLab
+ relationship: tosca.relationships.UsesController
+
+ compute9:
+ type: tosca.nodes.Node
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.MemberOfSite
+ - deployment:
+ node: MyDeployment
+ relationship: tosca.relationships.MemberOfDeployment
+
+ # SUBSCRIBER
+
+ # Let's add a user who can be administrator of the household
+ johndoe@stanford.us:
+ type: tosca.nodes.User
+ properties:
+ password: letmein
+ firstname: john
+ lastname: doe
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.MemberOfSite
+
+ # A subscriber
+ Stanford:
+ type: tosca.nodes.CORDSubscriber
+ properties:
+ service_specific_id: 123
+ firewall_enable: false
+ cdn_enable: false
+ url_filter_enable: false
+ url_filter_level: R
+ requirements:
+ - house_admin:
+ node: johndoe@stanford.us
+ relationship: tosca.relationships.AdminPrivilege
+
+ Barbera Lapinski:
+ type: tosca.nodes.CORDUser
+ properties:
+ mac: 01:02:03:04:05:06
+ level: PG_13
+ requirements:
+ - household:
+ node: Stanford
+ relationship: tosca.relationships.SubscriberDevice
+
+ Norbert Shumway:
+ type: tosca.nodes.CORDUser
+ properties:
+ mac: 90:E2:BA:82:F9:75
+ level: PG_13
+ requirements:
+ - household:
+ node: Stanford
+ relationship: tosca.relationships.SubscriberDevice
+
+ Fay Muldoon:
+ type: tosca.nodes.CORDUser
+ properties:
+ mac: 68:5B:35:9D:91:D5
+ level: PG_13
+ requirements:
+ - household:
+ node: Stanford
+ relationship: tosca.relationships.SubscriberDevice
+
+ Janene Earnest:
+ type: tosca.nodes.CORDUser
+ properties:
+ mac: 34:36:3B:C9:B6:A6
+ level: PG_13
+ requirements:
+ - household:
+ node: Stanford
+ relationship: tosca.relationships.SubscriberDevice
+
+
+ Topology:
+ type: tosca.nodes.DashboardView
+ properties:
+ url: template:xosMcordTopology
+
+ padmin@vicci.org:
+ type: tosca.nodes.User
+ properties:
+ firstname: XOS
+ lastname: admin
+ is_admin: true
+ requirements:
+ - mcord_dashboard:
+ node: Topology
+ relationship: tosca.relationships.UsesDashboard
+
+ # SERIVCES
service_mcord:
type: tosca.nodes.Service
requirements:
@@ -25,10 +167,11 @@
view_url: /admin/mcordservice/
kind: mcordservice
-
+ # Network Templates
Private:
type: tosca.nodes.NetworkTemplate
+ # Network
mcord_network:
type: tosca.nodes.network.Network.XOS
properties:
@@ -38,7 +181,6 @@
start_ip: 172.16.16.1
end_ip: 172.16.16.5
gateway_ip: 172.16.16.1
-
requirements:
- network_template:
node: Private
@@ -50,15 +192,15 @@
node: mysite_mcord_slice1
relationship: tosca.relationships.ConnectsToSlice
- mysite:
- type: tosca.nodes.Site
+ # mysite:
+ # type: tosca.nodes.Site
ubuntu-14.04-server-cloudimg-amd64-disk1:
type: tosca.nodes.Image
- trusty-server-multi-nic:
- type: tosca.nodes.Image
+ # trusty-server-multi-nic:
+ # type: tosca.nodes.Image
mysite_mcord_slice1:
description: MCORD Service Slice 1