diff --git a/README.md b/README.md
index 495092b..9c2e02e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # M-CORD Profile
 
-This repository is intended to host XOS Models definitions and XOS GUI Extensions that are horizontal to the profile and not tight to a single service.
+This repository is intended to host XOS Models definitions and XOS GUI Extensions that are horizontal to the profile and not tied to a single service.
 
 Stay tuned. More documentation coming soon!
diff --git a/mcord-cavium.yml b/mcord-cavium.yml
deleted file mode 100644
index b42511a..0000000
--- a/mcord-cavium.yml
+++ /dev/null
@@ -1,333 +0,0 @@
----
-
-# Copyright 2017-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.
-
-# profile_manifests/mcord.yml
-# Configures an M-CORD pod
-
-# Profile info located in orchestration/profiles/<cord_use_case>
-cord_use_case: mcord
-
-# site configuration
-site_name: mysite
-site_humanname: MySite
-#site_suffix: "{{ site_name }}.opencord.org"
-site_suffix: "cord.lab"
-deployment_type: MyDeployment
-
-# Feature toggles
-use_fabric: True
-use_maas: True
-
-# XOS config
-xos_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
-  - management-net.yaml
-  - mcord-cavium-services.yml
-  - xos-gui-extensions.yml
-  - service-graph-constraints.yaml
-
-# GUI Config [new GUI]
-gui_project_name: "M-CORD"
-gui_background: "cord-bg.jpg" # TODO find mcord image
-
-enabled_gui_extensions: []
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: mcord
-    path: orchestration/profiles/mcord
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-    keypair: vsg_rsa
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: addressmanager
-    path: orchestration/xos_services/addressmanager
-  - name: fabric
-    path: orchestration/xos_services/fabric
-  - name: vmme
-    path: orchestration/xos_services/vmme
-    keypair: mcord_rsa
-  - name: vspgwc
-    path: orchestration/xos_services/vspgwc
-    keypair: mcord_rsa
-  - name: vspgwu
-    path: orchestration/xos_services/vspgwu
-    keypair: mcord_rsa
-  - name: vhss
-    path: orchestration/xos_services/vhss
-    keypair: mcord_rsa
-  - name: hssdb
-    path: orchestration/xos_services/hss_db
-    keypair: mcord_rsa
-  - name: internetemulator
-    path: orchestration/xos_services/internetemulator
-    keypair: mcord_rsa
-  - name: sdncontroller
-    path: orchestration/xos_services/sdn-controller
-    keypair: mcord_rsa
-  - name: vepc
-    path: orchestration/xos_services/epc-service
-    keypair: mcord_rsa
-  - name: progran
-    path: orchestration/xos_services/progran
-
-# service graph gui constraints
-xos_gui_service_graph_constraints: '[
-  ["vepc", null, "mcord", null, null],
-  [null, null, "progran", null, null],
-  ["hssdb", "vhss", "vmme", null, null],
-  [null, "vspgwc", "sdncontroller","vspgwu", null],
-  [null, null, null, "internetemulator", null]
-]'
-
-# For creating the EPC networks in mcord-cavium-services.yml (copied from EPC blueprint)
-mcord_networks:
-  - name: s11_network
-    subnet: 112.0.0.0/24
-    permit_all_slices: True
-    template: private_template
-    owner: vspgwc
-  - name: sgi_network
-    subnet: 115.0.0.0/24
-    permit_all_slices: True
-    owner: vspgwu
-    template: private_template
-  - name: spgw_network
-    subnet: 117.0.0.0/24
-    permit_all_slices: True
-    template: private_template
-    owner: vspgwu
-  - name: flat_network_s1mme
-    subnet: 118.0.0.0/24
-    permit_all_slices: True
-    template: flat_template
-    owner: vmme
-  - name: flat_network_s1u
-    subnet: 119.0.0.0/24
-    permit_all_slices: True
-    template: flat_template
-    owner: vspgwu
-  - name: s6a_network
-    subnet: 120.0.0.0/24
-    permit_all_slices: True
-    template: private_template
-    owner: vhss
-  - name: db_network
-    subnet: 121.0.0.0/24
-    permit_all_slices: True
-    template: private_template
-    owner: vhss
-
-# Juju config
-charm_versions:
-  ceilometer: "cs:trusty/ceilometer-17"
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  nagios: "cs:trusty/nagios-10"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-4"
-  nrpe: "cs:trusty/nrpe-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-      - "juju"
-    ipv4_last_octet: 10
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 20
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 30
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 40
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 50
-
-  - name: "nagios-1"
-    service: "nagios"
-    aliases:
-      - "nagios"
-    ipv4_last_octet: 60
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 70
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 80
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 90
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 100
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 110
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - nagios
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", "nrpe", ]
-
-  - name: neutron-api
-    relations: [ "keystone",  "percona-cluster", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "percona-cluster:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-image_dir: /opt/cord_profile/images # Should change the build to symlink instead of copy images?
-xos_images:
-  - name: "image-test"
-    url: "https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201"
-    checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
-
-  - name: "image-mme"
-    url: "http://www.vicci.org/cord/image-mme.qcow2.20180511"
-    checksum: "sha256:c063e902172a08c9d6bc9fc3438f164dd7c0ddc6610c25c4ae47d6940629709e"
-
-  - name: "image-hss"
-    url: "http://www.vicci.org/cord/image-hss.qcow2.20180511"
-    checksum: "sha256:8ab04032c0d84d91e31bee6a261d70c26038182f80da3ac48e3391851e4eb88b"
-
-  - name: "image-hss-db"
-    url: "http://www.vicci.org/cord/image-hss-db.qcow2.20180511"
-    checksum: "sha256:829e4bc311bf11eeec114f469ea46088c4c9b63ed252c9f456c45cc52e1bcdfa"
-
-  - name: "image-spgwc"
-    url: "http://www.vicci.org/cord/image-spgwc.qcow2.20180511"
-    checksum: "sha256:13ee8cc125c0d8e6bdc6048e681b8a0b4fb368118706c79e1a09f9b6be9fc9b1"
-
-  - name: "image-spgwu"
-    url: "http://www.vicci.org/cord/image-spgwu.qcow2.20180511"
-    checksum: "sha256:76a538a7f4c92cd1ca71036c51ddfac21b66c59be9700d9e6e11e8e723369ef8"
-
-  - name: "image-internetemulator"
-    url: "http://www.vicci.org/cord/image-internetemulator.qcow2.20180511"
-    checksum: "sha256:336ced97a946d67ff317acfce54b4bfa510aafd2e517502ca87f6d196ceb3b80"
diff --git a/mcord-ng40.yml b/mcord-ng40.yml
deleted file mode 100644
index 4805155..0000000
--- a/mcord-ng40.yml
+++ /dev/null
@@ -1,282 +0,0 @@
----
-
-# Copyright 2017-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.
-
-# profile_manifests/mcord.yml
-# Configures an M-CORD pod
-
-# Profile info located in orchestration/profiles/<cord_use_case>
-cord_use_case: mcord
-
-# site configuration
-site_name: mysite
-site_humanname: MySite
-#site_suffix: "{{ site_name }}.opencord.org"
-site_suffix: "cord.lab"
-deployment_type: MyDeployment
-
-# Feature toggles
-use_fabric: True
-use_maas: True
-
-# XOS config
-xos_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
-  - management-net.yaml
-  - mcord-ng40-services.yml
-  - xos-gui-extensions.yml
-  - service-graph-constraints.yaml
-
-# GUI Config [new GUI]
-gui_project_name: "M-CORD"
-gui_background: "cord-bg.jpg" # TODO find mcord image
-
-enabled_gui_extensions: []
-
-# paths defined in manifest/default.xml
-xos_services:
-  - name: mcord
-    path: orchestration/profiles/mcord
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-    keypair: vsg_rsa
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: onos
-    path: orchestration/xos_services/onos-service
-    keypair: onos_rsa
-  - name: addressmanager
-    path: orchestration/xos_services/addressmanager
-  - name: fabric
-    path: orchestration/xos_services/fabric
-  - name: venb
-    path: orchestration/xos_services/venb
-    keypair: mcord_rsa
-  - name: vspgwc
-    path: orchestration/xos_services/vspgwc
-    keypair: mcord_rsa
-  - name: vspgwu
-    path: orchestration/xos_services/vspgwu
-    keypair: mcord_rsa
-  - name: vepc
-    path: orchestration/xos_services/epc-service
-    keypair: mcord_rsa
-
-# service graph gui constraints
-xos_gui_service_graph_constraints: '["mcord", "venb", ["vspgwc", "vspgwu"]]'
-
-# For creating the EPC networks in mcord-ng40-services.yml (copied from EPC blueprint)
-mcord_networks:
-  - name: s1u_network
-    subnet: 111.0.0.0/24
-    permit_all_slices: True
-    template: private_template
-    owner: vspgwu
-  - name: s11_network
-    subnet: 112.0.0.0/24
-    permit_all_slices: True
-    template: private_template
-    owner: vspgwc
-  - name: sgi_network
-    subnet: 115.0.0.0/24
-    permit_all_slices: True
-    template: private_template
-    owner: vspgwu
-  - name: spgw_network
-    subnet: 117.0.0.0/24
-    permit_all_slices: True
-    template: private_template
-    owner: vspgwu
-
-# Juju config
-charm_versions:
-  ceilometer: "cs:trusty/ceilometer-17"
-  ceilometer-agent: "cs:trusty/ceilometer-agent-13"
-  glance: "cs:trusty/glance-28"
-  keystone: "cs:trusty/keystone-267"
-  mongodb: "cs:trusty/mongodb-33"
-  percona-cluster: "cs:trusty/percona-cluster-31"
-  nagios: "cs:trusty/nagios-10"
-  neutron-api: "cs:~cordteam/trusty/neutron-api-6"
-  nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
-  nova-compute: "cs:~cordteam/trusty/nova-compute-4"
-  nrpe: "cs:trusty/nrpe-4"
-  ntp: "cs:trusty/ntp-14"
-  openstack-dashboard: "cs:trusty/openstack-dashboard-19"
-  rabbitmq-server: "cs:trusty/rabbitmq-server-42"
-
-head_lxd_list:
-  - name: "juju-1"
-    service: "juju"
-    aliases:
-      - "juju"
-    ipv4_last_octet: 10
-
-  - name: "ceilometer-1"
-    service: "ceilometer"
-    aliases:
-      - "ceilometer"
-    ipv4_last_octet: 20
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance-1"
-    service: "glance"
-    aliases:
-      - "glance"
-    ipv4_last_octet: 30
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone-1"
-    service: "keystone"
-    aliases:
-      - "keystone"
-    ipv4_last_octet: 40
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "percona-cluster-1"
-    service: "percona-cluster"
-    aliases:
-      - "percona-cluster"
-    ipv4_last_octet: 50
-
-  - name: "nagios-1"
-    service: "nagios"
-    aliases:
-      - "nagios"
-    ipv4_last_octet: 60
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api-1"
-    service: "neutron-api"
-    aliases:
-      - "neutron-api"
-    ipv4_last_octet: 70
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "nova-cloud-controller-1"
-    service: "nova-cloud-controller"
-    aliases:
-      - "nova-cloud-controller"
-    ipv4_last_octet: 80
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard-1"
-    service: "openstack-dashboard"
-    aliases:
-      - "openstack-dashboard"
-    ipv4_last_octet: 90
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server-1"
-    service: "rabbitmq-server"
-    aliases:
-      - "rabbitmq-server"
-    ipv4_last_octet: 100
-
-  - name: "mongodb-1"
-    service: "mongodb"
-    aliases:
-      - "mongodb"
-    ipv4_last_octet: 110
-
-lxd_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mongodb
-  - nagios
-  - neutron-api
-  - nova-cloud-controller
-  - openstack-dashboard
-  - percona-cluster
-  - rabbitmq-server
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-
-
-service_relations:
-  - name: keystone
-    relations: [ "percona-cluster", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "percona-cluster", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "percona-cluster", "keystone", "nrpe", ]
-
-  - name: neutron-api
-    relations: [ "keystone",  "percona-cluster", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "percona-cluster:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
-
-
-compute_relations:
-  - name: nova-compute
-    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
-
-  - name: "nova-compute:shared-db"
-    relations: [ "percona-cluster:shared-db", ]
-
-  - name: "nova-compute:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: ntp
-    relations: [ "nova-compute", ]
-
-
-xos_images:
-  - name: "image-venb"
-    url: "https://github.com/opencord/venb/releases/download/vms/ng40-vmcord-1-4GB.img.20171201"
-    checksum: "sha256:3d6d385247560c90db90b2591578c200eafaa62c232a964ab664420e8b2b33ac"
-
-  - name: "image-spgwc"
-    url: "http://www.vicci.org/cord/ngic-cp1-cmpress.qcow2.20171121"
-    checksum: "sha256:eca43de006d193625778597cc9b3f171752c31e0ce6dbed363954c87c33935a3"
-
-  - name: "image-spgwu"
-    url: "http://www.vicci.org/cord/ngic-dp1-cmpress.qcow2.20171121"
-    checksum: "sha256:2d431dc24b8de5d531ddf9a82c20f692d9ac8c9d4dd0295c535acc06c6635bc5"
diff --git a/podconfig/mcord-cavium-local.yml b/podconfig/mcord-cavium-local.yml
deleted file mode 100644
index 22e24bd..0000000
--- a/podconfig/mcord-cavium-local.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-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.
-
-
----
-# local-mcord Pod Config
-# Starts a M-CORD container set in the local environment
-
-cord_scenario: local
-cord_profile: mcord-cavium
-
diff --git a/podconfig/mcord-cavium-mock.yml b/podconfig/mcord-cavium-mock.yml
deleted file mode 100644
index 51f168d..0000000
--- a/podconfig/mcord-cavium-mock.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-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.
-
-
----
-# mock-mcord Pod Config
-# Creates a single-node mock M-CORD pod
-
-cord_scenario: mock
-cord_profile: mcord-cavium
-
diff --git a/podconfig/mcord-cavium-single.yml b/podconfig/mcord-cavium-single.yml
deleted file mode 100644
index 0ccf9ff..0000000
--- a/podconfig/mcord-cavium-single.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-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.
-
-
----
-# mcord-single Pod Config
-# Creates a single-node mock M-CORD pod w/synchronizers
-
-cord_scenario: single
-cord_profile: mcord-cavium
-
diff --git a/podconfig/mcord-cavium-virtual.yml b/podconfig/mcord-cavium-virtual.yml
deleted file mode 100644
index 724a137..0000000
--- a/podconfig/mcord-cavium-virtual.yml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-# Copyright 2017-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.
-
-# mcord-cavium-virtual Pod Config
-# Creates a virtual multi-node M-CORD pod, aka "mcord-in-a-box"
-
-cord_scenario: cord
-cord_profile: mcord-cavium
-
-compute_vm_mem: 65536
-
-vagrant_up_prereqs:
-  - prereqs-check
-  - ciab-ovs
-
-build_targets:
-  - compute1-up
-
-# Virtual-specific config of network interfaces, for virtual install in Vagrant
-#
-# platform-install config variables
-# which network interfaces belong to which bond on nodes
-management_net_interfaces:
-  - eth2
-
-fabric_net_interfaces:
-  - eth3
-
-# Bring up alias interfaces for the vsg and public networks, for forwarding
-# traffic in virtual pod
-use_addresspool_vsg: True
-use_addresspool_public: True
-
-# MaaS config variables
-external_iface: 'eth0'
-
-skipTags:
-  - 'set_compute_node_password'
-  - 'switch_support'
-  - 'reboot'
-  - 'interface_config'
-
-# Other old config carried over
-cord_in_a_box: True # what is this for?
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
diff --git a/podconfig/mcord-ng40-local.yml b/podconfig/mcord-ng40-local.yml
deleted file mode 100644
index 7ace9d5..0000000
--- a/podconfig/mcord-ng40-local.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-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.
-
-
----
-# local-rcord Pod Config
-# Starts a R-CORD container set in the local environment
-
-cord_scenario: local
-cord_profile: mcord-ng40
-
diff --git a/podconfig/mcord-ng40-mock.yml b/podconfig/mcord-ng40-mock.yml
deleted file mode 100644
index ebe8bf0..0000000
--- a/podconfig/mcord-ng40-mock.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-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.
-
-
----
-# mock-mcord Pod Config
-# Creates a single-node mock M-CORD pod
-
-cord_scenario: mock
-cord_profile: mcord-ng40
-
diff --git a/podconfig/mcord-ng40-single.yml b/podconfig/mcord-ng40-single.yml
deleted file mode 100644
index cec8727..0000000
--- a/podconfig/mcord-ng40-single.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-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.
-
-
----
-# mcord-single Pod Config
-# Creates a single-node mock M-CORD pod w/synchronizers
-
-cord_scenario: single
-cord_profile: mcord-ng40
-
diff --git a/podconfig/mcord-ng40-virtual.yml b/podconfig/mcord-ng40-virtual.yml
deleted file mode 100644
index 866341c..0000000
--- a/podconfig/mcord-ng40-virtual.yml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-# Copyright 2017-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.
-
-# mcord-ng40-virtual Pod Config
-# Creates a virtual multi-node M-CORD pod, aka "mcord-in-a-box"
-
-cord_scenario: cord
-cord_profile: mcord-ng40
-
-compute_vm_mem: 32768
-
-vagrant_up_prereqs:
-  - prereqs-check
-  - ciab-ovs
-
-build_targets:
-  - compute1-up
-
-# Virtual-specific config of network interfaces, for virtual install in Vagrant
-#
-# platform-install config variables
-# which network interfaces belong to which bond on nodes
-management_net_interfaces:
-  - eth2
-
-fabric_net_interfaces:
-  - eth3
-
-# Bring up alias interfaces for the vsg and public networks, for forwarding
-# traffic in virtual pod
-use_addresspool_vsg: True
-use_addresspool_public: True
-
-# MaaS config variables
-external_iface: 'eth0'
-
-skipTags:
-  - 'set_compute_node_password'
-  - 'switch_support'
-  - 'reboot'
-  - 'interface_config'
-
-# Other old config carried over
-cord_in_a_box: True # what is this for?
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
diff --git a/templates/fabric-service.yaml.j2 b/templates/fabric-service.yaml.j2
deleted file mode 100644
index a52987d..0000000
--- a/templates/fabric-service.yaml.j2
+++ /dev/null
@@ -1,78 +0,0 @@
-
-{#
-Copyright 2017-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_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/onosservice.yaml
-   - custom_types/serviceattribute.yaml
-   - custom_types/fabricservice.yaml
-   - custom_types/onosapp.yaml
-   - custom_types/serviceinstancelink.yaml
-
-description: fabric services, generated by mcord profile
-
-topology_template:
-  node_templates:
-
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-          name: ONOS_Fabric
-          kind: platform
-          no_container: true
-          rest_hostname: onos-fabric.{{ site_suffix }}
-
-    serviceattribute#fabric_network_cfg_json:
-      type: tosca.nodes.ServiceAttribute
-      requirements:
-          - service:
-              node: service#ONOS_Fabric
-              relationship: tosca.relationships.BelongsToOne
-      properties:
-          name: rest_onos/v1/network/configuration/
-          value: '{{ fabric_network_cfg_json | to_json }}'
-
-    service#fabric:
-      type: tosca.nodes.FabricService
-      properties:
-          name: fabric
-          kind: platform
-
-
-
-    Fabric_ONOS_app:
-      type: tosca.nodes.ONOSApp
-      requirements:
-          - owner:
-              node: service#ONOS_Fabric
-              relationship: tosca.relationships.BelongsToOne
-      properties:
-          name: Fabric_ONOS_app
-          dependencies: org.onosproject.drivers, org.onosproject.openflow, org.onosproject.netcfghostprovider, org.onosproject.segmentrouting
-
-    Fabric_ONOS_app_ONOS_Fabric:
-        type: tosca.nodes.ServiceInstanceLink
-        requirements:
-          - provider_service_instance:
-              node: Fabric_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-          - subscriber_service:
-              node: service#fabric
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/flat-net.yaml.j2 b/templates/flat-net.yaml.j2
deleted file mode 100644
index 13cb412..0000000
--- a/templates/flat-net.yaml.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/site.yaml
-   - custom_types/slice.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-
-description: flat network for connecting from VM in CORD to servers outside
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-          name: {{ site_name }}
-
-# flat network
-    flat_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: flat_template
-          visibility: private
-          translation: none
-          vtn_kind: FLAT
-
-    flat_network:
-      type: tosca.nodes.Network
-      properties:
-          name: flat_network
-          subnet: 103.0.0.0/24
-          permit_all_slices: true
-      requirements:
-          - template:
-              node: flat_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_flat
-              relationship: tosca.relationships.MemberOfSlice
-
-    {{ site_name }}_flat:
-      description: This slice exists solely to own the flat network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_flat
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/management-net.yaml.j2 b/templates/management-net.yaml.j2
deleted file mode 100644
index 41af735..0000000
--- a/templates/management-net.yaml.j2
+++ /dev/null
@@ -1,101 +0,0 @@
-
-{#
-Copyright 2017-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_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/networktemplate.yaml
-   - custom_types/network.yaml
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-
-description: management network config, generated by mcord profile
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-
-# 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: {{ vtn_net_management_local_cidr }}
-        permit_all_slices: true
-      requirements:
-        - template:
-            node: management_template
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: slice#{{ site_name }}_management
-            relationship: tosca.relationships.BelongsToOne
-
-{% if use_vtn_net_management_host %}
-# management_host (vtn: MANAGEMENT_HOST) network
-    management_host_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: management_host_template
-        visibility: private
-        translation: none
-        vtn_kind: MANAGEMENT_HOST
-
-    management_host:
-      type: tosca.nodes.Network
-      properties:
-        name: management_host
-        # ip_version: 4
-        subnet: {{ vtn_net_management_host_cidr }}
-        start_ip: {{ vtn_net_management_host_range_xos_low }}
-        end_ip: {{ vtn_net_management_host_range_xos_high }}
-        permit_all_slices: true
-      requirements:
-        - template:
-            node: management_host_template
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: slice#{{ site_name }}_management
-            relationship: tosca.relationships.BelongsToOne
-{% endif %}
-
-# Slice to own management networks
-    slice#{{ site_name }}_management:
-      description: This slice exists solely to own the management network(s)
-      type: tosca.nodes.Slice
-      properties:
-        network: noauto
-        name: {{ site_name }}_management
-      requirements:
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/mcord-cavium-services.yml.j2 b/templates/mcord-cavium-services.yml.j2
deleted file mode 100644
index dae78a8..0000000
--- a/templates/mcord-cavium-services.yml.j2
+++ /dev/null
@@ -1,595 +0,0 @@
----
-{#
-Copyright 2017-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_definitions_version: tosca_simple_yaml_1_0
-
-description: created by mcord profile
-
-imports:
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-   - custom_types/onosservice.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/vspgwcservice.yaml
-   - custom_types/vspgwcvendor.yaml
-   - custom_types/vspgwuservice.yaml
-   - custom_types/vspgwuvendor.yaml
-   - custom_types/vmmeservice.yaml
-   - custom_types/vmmevendor.yaml
-   - custom_types/vhssservice.yaml
-   - custom_types/vhssvendor.yaml
-   - custom_types/hssdbservice.yaml
-   - custom_types/hssdbvendor.yaml
-   - custom_types/internetemulatorservice.yaml
-   - custom_types/sdncontrollerservice.yaml
-   - custom_types/sdncontrollervendor.yaml
-   - custom_types/vepcservice.yaml
-   - custom_types/servicedependency.yaml
-   - custom_types/mcordsubscriberservice.yaml
-   - custom_types/progranservice.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-# flavors
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-    m1.large:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.large
-        must-exist: true
-    m1.medium:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.medium
-        must-exist: true
-    m1.xlarge:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.xlarge
-        must-exist: true
-
-# images
-    image-test:
-      type: tosca.nodes.Image
-      properties:
-        name: image-test
-
-    image-mme:
-      type: tosca.nodes.Image
-      properties:
-        name: image-mme
-
-    image-hss:
-      type: tosca.nodes.Image
-      properties:
-        name: image-hss
-
-    image-hss-db:
-      type: tosca.nodes.Image
-      properties:
-        name: image-hss-db
-
-    image-spgwc:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwc
-
-    image-spgwu:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwu
-
-    image-internetemulator:
-      type: tosca.nodes.Image
-      properties:
-        name: image-internetemulator
-
-# network templates
-    private_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: private_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    flat_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: flat_template
-          visibility: private
-          translation: none
-          vtn_kind: FLAT
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_vtn_net_management_host %}
-    management_host:
-      type: tosca.nodes.Network
-      properties:
-        name: management_host
-        must-exist: true
-{% endif %}
-
-# Other networks are created by vEPC service
-
-# ONOS_CORD, fully created in vtn.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_CORD
-
-# ONOS_Fabric, fully created in fabric.yaml
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_Fabric
-
-# vMME Service
-    service#vmme:
-      type: tosca.nodes.VMMEService
-      properties:
-          name: vmme
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vmme/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vmme:
-      description: vMME Service Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vmme
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vmme
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-mme
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.large
-              relationship: tosca.relationships.BelongsToOne
-
-    sprint_mme:
-      type: tosca.nodes.VMMEVendor
-      properties:
-        name: sprint_mme
-      requirements:
-        - image:
-            node: image-mme
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.large
-            relationship: tosca.relationships.BelongsToOne
-
-#vSPGWC Service
-    service#vspgwc:
-      type: tosca.nodes.VSPGWCService
-      properties:
-          name: vspgwc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwc/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwc:
-      description: vSPGW-C slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwc
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.large
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwc:
-      type: tosca.nodes.VSPGWCVendor
-      properties:
-        name: intel_vspgwc
-      requirements:
-        - image:
-            node: image-spgwc
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.large
-            relationship: tosca.relationships.BelongsToOne
-
-
-#vSPGWU Service
-    service#vspgwu:
-      type: tosca.nodes.VSPGWUService
-      properties:
-          name: vspgwu
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwu/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwu:
-      description: vSPGW-U slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwu
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.xlarge
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwu:
-      type: tosca.nodes.VSPGWUVendor
-      properties:
-        name: intel_vspgwu
-      requirements:
-        - image:
-            node: image-spgwu
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.xlarge
-            relationship: tosca.relationships.BelongsToOne
-
-# vHSS service
-    service#vhss:
-      type: tosca.nodes.VHSSService
-      properties:
-          name: vhss
-          kind: vEPC
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vhss/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vhss:
-      description: vHSS Service Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vhss
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vhss
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-hss
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.large
-              relationship: tosca.relationships.BelongsToOne
-
-    sprint_hss:
-      type: tosca.nodes.VHSSVendor
-      properties:
-        name: sprint_hss
-      requirements:
-        - image:
-            node: image-hss
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.large
-            relationship: tosca.relationships.BelongsToOne
-
-# HSS_DB service
-    service#hssdb:
-      type: tosca.nodes.HSSDBService
-      properties:
-          name: hssdb
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/hssdb/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_hssdb:
-      description: HSS-DB Service Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_hssdb
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#hssdb
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-hss-db
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.large
-              relationship: tosca.relationships.BelongsToOne
-
-    sprint_hssdb:
-      type: tosca.nodes.HSSDBVendor
-      properties:
-        name: sprint_hssdb
-      requirements:
-        - image:
-            node: image-hss-db
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.large
-            relationship: tosca.relationships.BelongsToOne
-
-# InternetEmulator service
-    service#internetemulator:
-      type: tosca.nodes.InternetEmulatorService
-      properties:
-          name: internetemulator
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/internetemulator/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_internetemulator:
-      description: Internetemulator Service Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_internetemulator
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#internetemulator
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-internetemulator
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.small
-              relationship: tosca.relationships.BelongsToOne
-
-#SDN Controller Service
-    service#sdncontroller:
-      type: tosca.nodes.SDNControllerService
-      properties:
-          name: sdncontroller
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwu/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_sdncontroller:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_sdncontroller
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#sdncontroller
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-test
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.small
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_sdncontroller:
-      type: tosca.nodes.SDNControllerVendor
-      properties:
-        name: intel_sdncontroller
-      requirements:
-        - image:
-            node: image-test
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.small
-            relationship: tosca.relationships.BelongsToOne
-
-# vEPC Service
-    service#vepc:
-      type: tosca.nodes.VEPCService
-      properties:
-          name: vepc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/epc-service/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-# Progran Service
-    service#progran:
-      type: tosca.nodes.ProgranService
-      properties:
-          name: progran
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/epc-service/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-# ServiceDependencies
-    vmme_vspgwc:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vmme
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-    vmme_vspgwu:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vmme
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwc_vspgwu:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vmme_vhss:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vmme
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vhss
-            relationship: tosca.relationships.BelongsToOne
-
-    vhss_hssdb:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vhss
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#hssdb
-            relationship: tosca.relationships.BelongsToOne
-
-# M-CORD Subscriber
-    service#mcord:
-      type: tosca.nodes.MCordSubscriberService
-      properties:
-        name: mcord
-
-    # ServiceDependency M-CORD to vMME
-    mcord_vmme:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vmme
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#mcord
-            relationship: tosca.relationships.BelongsToOne
-
-# EPC networks
-
-{% for network in mcord_networks %}
-    {{ network['name'] }}:
-      type: tosca.nodes.Network
-      properties:
-          name: {{ network['name'] }}
-          subnet: {{ network['subnet'] }}
-          permit_all_slices: {{ network['permit_all_slices'] }}
-      requirements:
-          - template:
-              node: {{ network['template'] }}
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_{{ network['owner'] }}
-              relationship: tosca.relationships.BelongsToOne
-
-{% endfor %}
-
-# Network Slices for InternetEmulator, not created by EPC
-
-    internetemulator_slice_management_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: management
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_internetemulator
-            relationship: tosca.relationships.BelongsToOne
-
-    internetemulator_slice_sgi_network:
-      type: tosca.nodes.NetworkSlice
-      requirements:
-        - network:
-            node: sgi_network
-            relationship: tosca.relationships.BelongsToOne
-        - slice:
-            node: {{ site_name }}_internetemulator
-            relationship: tosca.relationships.BelongsToOne
diff --git a/templates/mcord-ng40-services.yml.j2 b/templates/mcord-ng40-services.yml.j2
deleted file mode 100644
index c1a2ce0..0000000
--- a/templates/mcord-ng40-services.yml.j2
+++ /dev/null
@@ -1,338 +0,0 @@
----
-{#
-Copyright 2017-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_definitions_version: tosca_simple_yaml_1_0
-
-description: created by mcord profile, need to add M-CORD services later
-
-imports:
-   - custom_types/slice.yaml
-   - custom_types/site.yaml
-   - custom_types/image.yaml
-   - custom_types/flavor.yaml
-   - custom_types/network.yaml
-   - custom_types/networktemplate.yaml
-   - custom_types/onosservice.yaml
-   - custom_types/networkslice.yaml
-   - custom_types/venbservice.yaml
-   - custom_types/vspgwcservice.yaml
-   - custom_types/vspgwcvendor.yaml
-   - custom_types/vspgwuservice.yaml
-   - custom_types/vspgwuvendor.yaml
-   - custom_types/vepcservice.yaml
-   - custom_types/servicedependency.yaml
-   - custom_types/mcordsubscriberservice.yaml
-
-topology_template:
-  node_templates:
-
-# site, image, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        must-exist: true
-        name: {{ site_name }}
-
-# flavors
-
-    m1.small:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.small
-        must-exist: true
-    m1.large:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.large
-        must-exist: true
-    m1.medium:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.medium
-        must-exist: true
-    m1.xlarge:
-      type: tosca.nodes.Flavor
-      properties:
-        name: m1.xlarge
-        must-exist: true
-
-# images
-    image-venb:
-      type: tosca.nodes.Image
-      properties:
-        name: image-venb
-
-    image-spgwc:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwc
-
-    image-spgwu:
-      type: tosca.nodes.Image
-      properties:
-        name: image-spgwu
-
-# network templates
-    private_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: private_template
-          visibility: private
-          translation: none
-          vtn_kind: PRIVATE
-
-    flat_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: flat_template
-          visibility: private
-          translation: none
-          vtn_kind: FLAT
-
-# management networks, fully created in management-net.yaml
-    management:
-      type: tosca.nodes.Network
-      properties:
-        must-exist: true
-        name: management
-
-{% if use_vtn_net_management_host %}
-    management_host:
-      type: tosca.nodes.Network
-      properties:
-        name: management_host
-        must-exist: true
-{% endif %}
-
-# ONOS_CORD, fully created in vtn.yaml
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_CORD
-
-# ONOS_Fabric, fully created in fabric.yaml
-    service#ONOS_Fabric:
-      type: tosca.nodes.ONOSService
-      properties:
-        must-exist: true
-        name: ONOS_Fabric
-
-# vENB Service
-    service#venb:
-      type: tosca.nodes.VENBService
-      properties:
-          name: venb
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/venb/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_venb:
-      description: vENB Service Slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_venb
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#venb
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-venb
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.medium
-              relationship: tosca.relationships.BelongsToOne
-
-
-#vSPGWC Service
-    service#vspgwc:
-      type: tosca.nodes.VSPGWCService
-      properties:
-          name: vspgwc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwc/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwc:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwc
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwc
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.large
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwc:
-      type: tosca.nodes.VSPGWCVendor
-      properties:
-        name: intel_vspgwc
-      requirements:
-        - image:
-            node: image-spgwc
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.large
-            relationship: tosca.relationships.BelongsToOne
-
-
-#vSPGWU Service
-    service#vspgwu:
-      type: tosca.nodes.VSPGWUService
-      properties:
-          name: vspgwu
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/vspgwu/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-    {{ site_name }}_vspgwu:
-      description: SDN controller slice
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vspgwu
-          default_isolation: vm
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.BelongsToOne
-          - service:
-              node: service#vspgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_image:
-              node: image-spgwu
-              relationship: tosca.relationships.BelongsToOne
-          - default_flavor:
-              node: m1.xlarge
-              relationship: tosca.relationships.BelongsToOne
-
-    intel_vspgwu:
-      type: tosca.nodes.VSPGWUVendor
-      properties:
-        name: intel_vspgwu
-      requirements:
-        - image:
-            node: image-spgwu
-            relationship: tosca.relationships.BelongsToOne
-        - flavor:
-            node: m1.xlarge
-            relationship: tosca.relationships.BelongsToOne
-
-# vEPC Service
-    service#vepc:
-      type: tosca.nodes.VEPCService
-      properties:
-          name: vepc
-          public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
-          private_key_fn: /opt/xos/services/venb/keys/mcord_rsa
-      artifacts:
-          pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
-
-# ServiceDependencies
-    venb_vspgwc:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#venb
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-
-    venb_vspgwu:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#venb
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-    vspgwc_vspgwu:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#vspgwc
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#vspgwu
-            relationship: tosca.relationships.BelongsToOne
-
-# M-CORD Subscriber
-    service#mcord:
-      type: tosca.nodes.MCordSubscriberService
-      properties:
-        name: mcord
-
-    # ServiceDependency M-CORD to vENB
-    mcord_venb:
-      type: tosca.nodes.ServiceDependency
-      properties:
-        connect_method: None
-      requirements:
-        - subscriber_service:
-            node: service#venb
-            relationship: tosca.relationships.BelongsToOne
-        - provider_service:
-            node: service#mcord
-            relationship: tosca.relationships.BelongsToOne
-
-# EPC networks
-
-{% for network in mcord_networks %}
-    {{ network['name'] }}:
-      type: tosca.nodes.Network
-      properties:
-          name: {{ network['name'] }}
-          subnet: {{ network['subnet'] }}
-          permit_all_slices: {{ network['permit_all_slices'] }}
-      requirements:
-          - template:
-              node: {{ network['template'] }}
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_{{ network['owner'] }}
-              relationship: tosca.relationships.BelongsToOne
-
-{% endfor %}
diff --git a/templates/service-graph-constraints.yaml.j2 b/templates/service-graph-constraints.yaml.j2
deleted file mode 100644
index 00fbc4a..0000000
--- a/templates/service-graph-constraints.yaml.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/servicegraphconstraint.yaml
-
-description: Constraints on the Services position in the graph
-
-topology_template:
-  node_templates:
-
-    constraints:
-      type: tosca.nodes.ServiceGraphConstraint
-      properties:
-        constraints: '{{ xos_gui_service_graph_constraints }}'
diff --git a/templates/shared-net.yaml.j2 b/templates/shared-net.yaml.j2
deleted file mode 100644
index 0678e6c..0000000
--- a/templates/shared-net.yaml.j2
+++ /dev/null
@@ -1,54 +0,0 @@
----
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-  - custom_types/network.yaml
-  - custom_types/networktemplate.yaml
-  - custom_types/slice.yaml
-  - custom_types/site.yaml
-
-description: shared network config, generated by mcord profile
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-# shared network
-    shared_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: shared_template
-        visibility: private
-        translation: none
-        vtn_kind: PRIVATE
-
-    shared_network:
-      type: tosca.nodes.Network
-      properties:
-        name: shared_network
-        subnet: 100.0.0.0/24
-      requirements:
-        - template:
-            node: shared_template
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: {{ site_name }}_shared
-            relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_shared:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-        name: {{ site_name }}_shared
-        network: noauto
-      requirements:
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/vsg-net.yaml.j2 b/templates/vsg-net.yaml.j2
deleted file mode 100644
index 18e9f2e..0000000
--- a/templates/vsg-net.yaml.j2
+++ /dev/null
@@ -1,53 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-  - custom_types/network.yaml
-  - custom_types/networktemplate.yaml
-  - custom_types/slice.yaml
-  - custom_types/site.yaml
-
-description: vsg network config, generated by mcord profile
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-# vsg network
-    vsg_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          name: vsg_template
-          visibility: private
-          translation: none
-          vtn_kind: VSG
-
-    vsg_network:
-      type: tosca.nodes.Network
-      properties:
-          name: vsg_network
-          subnet: {{ addresspool_vsg_cidr }}
-      requirements:
-          - template:
-              node: vsg_template
-              relationship: tosca.relationships.BelongsToOne
-          - owner:
-              node: {{ site_name }}_vsg
-              relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_vsg:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-          name: {{ site_name }}_vsg
-          network: noauto
-      requirements:
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/vtn-service.yaml.j2 b/templates/vtn-service.yaml.j2
deleted file mode 100644
index 4f5a419..0000000
--- a/templates/vtn-service.yaml.j2
+++ /dev/null
@@ -1,90 +0,0 @@
-{#
-Copyright 2017-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_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.{{ site_suffix }}
-          rest_port: 8182
-
-    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: {{ vtn_net_management_local_cidr | ipaddr('1') }}
-          ovsdbPort: 6641
-          sshUser: root
-          sshKeyFile: /root/node_key
-          sshPort: 22
-          xosEndpoint: xos-chameleon.{{ site_suffix }}:{{ xos_chameleon_port }}
-          xosUser: {{ xos_admin_user }}
-          xosPassword: {{ xos_admin_pass }}
-          vtnAPIVersion: 2
-          controllerPort: onos-cord.{{ site_suffix }}:6654
-          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: {{ onos_mavenrepo_url }}/repository/org/opencord/cord-config/{{ cord_config_app_version }}/cord-config-{{ cord_config_app_version }}.oar, {{ onos_mavenrepo_url }}/repository/org/opencord/vtn/{{ cord_vtn_app_version }}/vtn-{{ cord_vtn_app_version }}.oar
-          dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
-          # autogenerate: vtn-network-cfg
-
-    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
-
diff --git a/templates/wan-net.yaml.j2 b/templates/wan-net.yaml.j2
deleted file mode 100644
index ad3287f..0000000
--- a/templates/wan-net.yaml.j2
+++ /dev/null
@@ -1,53 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-  - custom_types/network.yaml
-  - custom_types/networktemplate.yaml
-  - custom_types/slice.yaml
-  - custom_types/site.yaml
-
-description: wan network config, generated by mcord profile
-
-topology_template:
-  node_templates:
-
-# site, fully created in deployment.yaml
-    {{ site_name }}:
-      type: tosca.nodes.Site
-      properties:
-        name: {{ site_name }}
-        must-exist: true
-
-# wan network
-    wan_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: wan_template
-        visibility: private
-        translation: none
-        vtn_kind: PRIVATE
-
-    wan_network:
-      type: tosca.nodes.Network
-      properties:
-        name: wan_network
-        subnet: 102.0.0.0/24
-      requirements:
-        - template:
-            node: wan_template
-            relationship: tosca.relationships.BelongsToOne
-        - owner:
-            node: {{ site_name }}_wan
-            relationship: tosca.relationships.BelongsToOne
-
-    {{ site_name }}_wan:
-      description: This slice exists solely to own the private network
-      type: tosca.nodes.Slice
-      properties:
-        name: {{ site_name }}_wan
-        network: noauto
-      requirements:
-        - site:
-            node: {{ site_name }}
-            relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/xos-gui-extensions.yml.j2 b/templates/xos-gui-extensions.yml.j2
deleted file mode 100644
index f10c695..0000000
--- a/templates/xos-gui-extensions.yml.j2
+++ /dev/null
@@ -1,37 +0,0 @@
-
-{#
-Copyright 2017-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_definitions_version: tosca_simple_yaml_1_0
-
-description: Persist xos-sample-gui-extension
-
-imports:
-   - custom_types/xosguiextension.yaml
-
-topology_template:
-  node_templates:
-
-    # UI Extension
-{% for ext in enabled_gui_extensions %}
-    {{ext.name}}:
-      type: tosca.nodes.XOSGuiExtension
-      properties:
-        name: {{ext.name}}
-        files: /xos/extensions/{{ext.name}}/vendor.js, /xos/extensions/{{ext.name}}/app.js {% if ext.extra_files is defined %}{% for file in ext.extra_files%}, /xos/extensions/{{ext.name}}/{{file}} {% endfor %}{% endif %}
-
-{% endfor %}