Merge "[CORD-2641] Validating uniqueness of imsi_number"
diff --git a/mcord-cavium.yml b/mcord-cavium.yml
index d4d5239..4f5567c 100644
--- a/mcord-cavium.yml
+++ b/mcord-cavium.yml
@@ -40,9 +40,6 @@
- xos-gui-extensions.yml
- service-graph-constraints.yaml
-xos_other_templates:
- - fabric-network-cfg.json
-
# GUI Config [new GUI]
gui_project_name: "M-CORD"
gui_background: "cord-bg.jpg" # TODO find mcord image
@@ -317,8 +314,8 @@
checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
- name: "image-mme"
- url: "http://www.vicci.org/cord/c3po-mme1-comp.qcow2.20180126"
- checksum: "sha256:cca87562d44b7886c426da1e920ef9add9cb615504f60da17432ec825d81d3bb"
+ url: "http://www.vicci.org/cord/c3po-mme1-comp.qcow2.20180131"
+ checksum: "sha256:f7e3cb27a02e890f65472c79038be68a161c692ad7c48679d09f12ea97b5c024"
- name: "image-hss"
url: "http://www.vicci.org/cord/c3po-hss1-comp.qcow2.20180126"
diff --git a/mcord-ng40.yml b/mcord-ng40.yml
index bab2eb9..e0f1bac 100644
--- a/mcord-ng40.yml
+++ b/mcord-ng40.yml
@@ -40,9 +40,6 @@
- xos-gui-extensions.yml
- service-graph-constraints.yaml
-xos_other_templates:
- - fabric-network-cfg.json
-
# GUI Config [new GUI]
gui_project_name: "M-CORD"
gui_background: "cord-bg.jpg" # TODO find mcord image
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 e28d5ea..a52987d 100644
--- a/templates/fabric-service.yaml.j2
+++ b/templates/fabric-service.yaml.j2
@@ -25,7 +25,7 @@
- custom_types/onosapp.yaml
- custom_types/serviceinstancelink.yaml
-description: fabric services, generated by platform-install
+description: fabric services, generated by mcord profile
topology_template:
node_templates:
@@ -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
diff --git a/templates/flat-net.yaml.j2 b/templates/flat-net.yaml.j2
index e9588c0..13cb412 100644
--- a/templates/flat-net.yaml.j2
+++ b/templates/flat-net.yaml.j2
@@ -1,7 +1,6 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - custom_types/xos.yaml
- custom_types/site.yaml
- custom_types/slice.yaml
- custom_types/flavor.yaml
diff --git a/templates/mcord-cavium-services.yml.j2 b/templates/mcord-cavium-services.yml.j2
index 609d9ca..a182c90 100644
--- a/templates/mcord-cavium-services.yml.j2
+++ b/templates/mcord-cavium-services.yml.j2
@@ -21,7 +21,6 @@
description: created by platform-install
imports:
- - custom_types/xos.yaml
- custom_types/slice.yaml
- custom_types/site.yaml
- custom_types/image.yaml
diff --git a/templates/mcord-ng40-services.yml.j2 b/templates/mcord-ng40-services.yml.j2
index 1b0233b..1c04883 100644
--- a/templates/mcord-ng40-services.yml.j2
+++ b/templates/mcord-ng40-services.yml.j2
@@ -21,7 +21,6 @@
description: created by platform-install, need to add M-CORD services later
imports:
- - custom_types/xos.yaml
- custom_types/slice.yaml
- custom_types/site.yaml
- custom_types/image.yaml
diff --git a/test/roles/create-internetemulator/templates/internetemulator.yaml.j2 b/test/roles/create-internetemulator/templates/internetemulator.yaml.j2
index 3d075e2..5fcedf0 100644
--- a/test/roles/create-internetemulator/templates/internetemulator.yaml.j2
+++ b/test/roles/create-internetemulator/templates/internetemulator.yaml.j2
@@ -18,7 +18,6 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - custom_types/xos.yaml
- custom_types/internetemulatorservice.yaml
- custom_types/internetemulatorserviceinstance.yaml
diff --git a/test/roles/test-mcord-base/tasks/main.yml b/test/roles/test-mcord-base/tasks/main.yml
index 111e019..d4b5dd0 100644
--- a/test/roles/test-mcord-base/tasks/main.yml
+++ b/test/roles/test-mcord-base/tasks/main.yml
@@ -28,8 +28,8 @@
tags:
- skip_ansible_lint # running a sub job
-- name: Wait for VMs to appear in Nova
- shell: source /opt/cord_profile/admin-openrc.sh; nova list --all-tenants|grep '{{ item }}' > /dev/null
+- name: Wait for VMs to come up
+ shell: source /opt/cord_profile/admin-openrc.sh; nova list --all-tenants|grep '{{ item }}.*\(ACTIVE\|ERROR\)' > /dev/null
args:
executable: /bin/bash
register: result