From 6ae89d5df37c626d7bd6f1fcf94571e718f10b02 Mon Sep 17 00:00:00 2001
From: Ruoyu Ying <ruoyu.ying@intel.com>
Date: Thu, 20 Sep 2018 18:30:15 +0800
Subject: Update sample response and resolve directives

Update the sample conductor response and add name_map
to resolve directives. Also updated functest payload
and localpolicies with the new policy model.

Change-Id: I5255c40fb714558261efffabbdf44da535171cbf
Issue-ID: OPTFRA-322
Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>
---
 test/placement-tests/conductor_response.json | 62 ++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 3 deletions(-)

(limited to 'test/placement-tests/conductor_response.json')

diff --git a/test/placement-tests/conductor_response.json b/test/placement-tests/conductor_response.json
index e7037c2..ee38ce9 100644
--- a/test/placement-tests/conductor_response.json
+++ b/test/placement-tests/conductor_response.json
@@ -24,9 +24,65 @@
               "location_type": "openstack-cloud"
             },
             "attributes": {
-              "flavors": {
-                "flavor_label_1": "vim_flavor_X",
-                "flavor_label_2": "vim_flavor_Y"
+              "directives": {
+                "directives": [
+                {
+                  "id": "vFW_0",
+                  "type": "<vnfc/tocsa.nodes.nfv.Vdu.Compute>",
+                  "directives": [
+                    {
+                      "type": "flavor_directives",
+                      "attributes": [
+                        {
+                          "attribute_name": "oof_returned_flavor_label_for_firewall",
+                          "attribute_value": "vim_flavor_X"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "sriovNICNetwork_directives",
+                      "attributes": [
+                        {
+                          "attribute_name": "oof_returned_vnic_type_for_firewall_protected",
+                          "attribute_value": "direct"
+                        },
+                        {
+                          "attribute_name": "oof_returned_provider_network_for_firewall_protected",
+                          "attribute_value": "physnet1"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "sriovNICNetwork_directives",
+                      "attributes": [
+                        {
+                          "attribute_name": "oof_returned_vnic_type_for_firewall_unprotected",
+                          "attribute_value": "direct"
+                        },
+                        {
+                          "attribute_name": "oof_returned_provider_network_for_firewall_unprotected",
+                          "attribute_value": "physnet2"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "id": "vFW_1",
+                  "type": "<vnfc/tocsa.nodes.nfv.Vdu.Compute>",
+                  "directives": [
+                    {
+                      "type": "flavor_directives",
+                      "attributes": [
+                        {
+                          "attribute_name": "oof_returned_flavor_label_for_generator",
+                          "attribute_value": "vim_flavor_Y"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
               },
               "cloud_owner": "CloudOwner1",
               "physical-location-id": "DLLSTX1A",
-- 
cgit 1.2.3-korg