adding remaining encorced role types to models
Change-Id: I4df8e264992ac64321d6f38f77d341bb686e049b
diff --git a/src/test/cord-api/Tests/targets/xosapitests.xtarget b/src/test/cord-api/Tests/targets/xosapitests.xtarget
index 9102ab0..0fbcd8c 100644
--- a/src/test/cord-api/Tests/targets/xosapitests.xtarget
+++ b/src/test/cord-api/Tests/targets/xosapitests.xtarget
@@ -181,10 +181,22 @@
${json_{{ m.name | lower}}_role_tmp}= Set Variable admin
${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /role "${json_{{ m.name | lower }}_role_tmp}"
{% endif %}
+ {% if m.name == "SliceRole" -%}
+ ${json_{{ m.name | lower}}_role_tmp}= Set Variable admin
+ ${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /role "${json_{{ m.name | lower }}_role_tmp}"
+ {% endif %}
+ {% if m.name == "ControllerRole" -%}
+ ${json_{{ m.name | lower}}_role_tmp}= Set Variable admin
+ ${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /role "${json_{{ m.name | lower }}_role_tmp}"
+ {% endif %}
{% if m.name == "Slice" -%}
${json_{{ m.name | lower}}_name}= Generate Random Slice Name
${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /name "${json_{{ m.name | lower }}_name}"
- {% endif %}
+ {% endif -%}
+ {% if m.name == "InterfaceType" -%}
+ ${json_{{ m.name | lower}}_direction}= Set Variable in
+ ${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /name "${json_{{ m.name | lower }}_direction}"
+ {% endif -%}
{% if m.name == "Network" -%}
${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /permit_all_slices true
{% endif %}
diff --git a/src/test/cord-api/Tests/targets/xoslibrary.xtarget b/src/test/cord-api/Tests/targets/xoslibrary.xtarget
index 8564ebf..8ce1f83 100644
--- a/src/test/cord-api/Tests/targets/xoslibrary.xtarget
+++ b/src/test/cord-api/Tests/targets/xoslibrary.xtarget
@@ -183,10 +183,22 @@
${json_{{ m.name | lower}}_role_tmp}= Set Variable admin
${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /role "${json_{{ m.name | lower }}_role_tmp}"
{% endif %}
+ {% if m.name == "SliceRole" -%}
+ ${json_{{ m.name | lower}}_role_tmp}= Set Variable admin
+ ${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /role "${json_{{ m.name | lower }}_role_tmp}"
+ {% endif %}
+ {% if m.name == "ControllerRole" -%}
+ ${json_{{ m.name | lower}}_role_tmp}= Set Variable admin
+ ${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /role "${json_{{ m.name | lower }}_role_tmp}"
+ {% endif %}
{% if m.name == "Slice" -%}
${json_{{ m.name | lower}}_name}= Generate Random Slice Name
${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /name "${json_{{ m.name | lower }}_name}"
{% endif -%}
+ {% if m.name == "InterfaceType" -%}
+ ${json_{{ m.name | lower}}_direction}= Set Variable in
+ ${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /name "${json_{{ m.name | lower }}_direction}"
+ {% endif -%}
{% if m.name == "Network" -%}
${json_{{ m.name | lower}}_tmp}= Set Json Value ${json_{{ m.name | lower }}_tmp} /permit_all_slices true
{% endif -%}