CORD-1954 remove unnecessary services from ecordglobal
fix global app versions
setup onos-cord service

Change-Id: I5186b11db32930981f1f6be4542d69158423fb02
diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index 024aad9..5ad1a91 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -31,8 +31,7 @@
 
 # XOS config
 xos_tosca_config_templates:
-  - vtn-service.yaml
-  - fabric-service.yaml
+  - onos-global-service.yaml
   - vnaasglobal-service.yaml
   - xos-gui-extensions.yml
   - carrierethernet-global-app.yaml
@@ -55,12 +54,6 @@
 
 # paths defined in manifest/default.xml
 xos_services:
-  - name: vtn
-    path: orchestration/xos_services/vtn-service
-  - name: openstack
-    path: orchestration/xos_services/openstack
-  - name: fabric
-    path: orchestration/xos_services/fabric
   - name: onos
     path: orchestration/xos_services/onos-service
   - name: vnaas
@@ -69,4 +62,3 @@
 # VTN network configuration
 management_network_ip: 172.27.0.1/24
 data_plane_ip: 10.168.0.253/24
-
diff --git a/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2 b/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2
index 073d797..1edd97a 100644
--- a/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2
+++ b/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2
@@ -1,3 +1,4 @@
+
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
@@ -21,4 +22,4 @@
               node: service#ONOS_CORD
               relationship: tosca.relationships.TenantOfService
       properties:
-          install_dependencies: http://mavenrepo:8080/repository/org/opencord/ce/ce-api/1.0.0/ce-api-1.0.0.oar, http://mavenrepo:8080/repository/org/opencord/ce/ecord-global-app/1.0.0/ecord-global-app-1.0.0.oar
+          install_dependencies: http://mavenrepo:8080/repository/org/opencord/ce/ce-api/1.0.0-SNAPSHOT/ce-api-1.0.0-SNAPSHOT.oar, http://mavenrepo:8080/repository/org/opencord/ce/ecord-global-app/1.0.0-SNAPSHOT/ecord-global-app-1.0.0-SNAPSHOT.oar
diff --git a/roles/cord-profile/templates/onos-global-service.yaml.j2 b/roles/cord-profile/templates/onos-global-service.yaml.j2
new file mode 100644
index 0000000..758d0bb
--- /dev/null
+++ b/roles/cord-profile/templates/onos-global-service.yaml.j2
@@ -0,0 +1,38 @@
+
+{#
+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/xos.yaml
+
+description: Configures the VTN ONOS service
+
+topology_template:
+  node_templates:
+
+    service#ONOS_CORD:
+      type: tosca.nodes.ONOSService
+      requirements:
+      properties:
+          kind: onos
+          view_url: /admin/onos/onosservice/$id$/
+          no_container: true
+          rest_hostname: onos-cord
+          rest_port: 8182
+          replaces: service_ONOS_CORD
diff --git a/roles/cord-profile/templates/vnaasglobal-service.yaml.j2 b/roles/cord-profile/templates/vnaasglobal-service.yaml.j2
index e10c94d..e4d7369 100644
--- a/roles/cord-profile/templates/vnaasglobal-service.yaml.j2
+++ b/roles/cord-profile/templates/vnaasglobal-service.yaml.j2
@@ -54,8 +54,8 @@
       requirements:
       properties:
         name: onlabT
-        onos_ip: 127.0.0.1
-        onos_port: 8181
+        onos_ip: onos-cord
+        onos_port: 8182
         onos_username: onos
         onos_password: rocks
         onos_type: global
@@ -136,4 +136,4 @@
         connect_point_2_id: netconf:192.168.56.20:830/0
         vlanids: 100
         cord_site_name: onlabT
-        bwp: gold
\ No newline at end of file
+        bwp: gold