CORD-2461 Fix loading ONOS netcfg via TOSCA
Change-Id: I7d280518d0d3b1613490412c9945f7f8a68cba9f
diff --git a/rcord.yml b/rcord.yml
index a94f6e5..e0f32c4 100644
--- a/rcord.yml
+++ b/rcord.yml
@@ -41,9 +41,6 @@
- service-graph-constraints.yaml
- xos-gui-extensions.yml
-xos_other_templates:
- - fabric-network-cfg.json
-
enabled_gui_extensions:
- name: vtr
path: orchestration/xos_services/vtr/xos/gui
diff --git a/templates/fabric-network-cfg.json.j2 b/templates/fabric-network-cfg.json.j2
deleted file mode 100644
index 853c7e9..0000000
--- a/templates/fabric-network-cfg.json.j2
+++ /dev/null
@@ -1,19 +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.
-#}
-
-
-{}
\ No newline at end of file
diff --git a/templates/fabric-service.yaml.j2 b/templates/fabric-service.yaml.j2
index 77ed898..3d3a155 100644
--- a/templates/fabric-service.yaml.j2
+++ b/templates/fabric-service.yaml.j2
@@ -45,8 +45,8 @@
node: service#ONOS_Fabric
relationship: tosca.relationships.BelongsToOne
properties:
- name: fabric_network_cfg_json
- value: {{ fabric_network_cfg_json }}
+ name: rest_onos/v1/network/configuration/
+ value: '{{ fabric_network_cfg_json | to_json }}'
service#fabric:
type: tosca.nodes.FabricService