Merge "Updated simulator test files"

3 files changed, 5 insertions, 5 deletions

diff --git a/so-simulator/src/main/java/org/onap/so/simulator/actions/aai/ProcessVnfc.java b/so-simulator/src/main/java/org/onap/so/simulator/actions/aai/ProcessVnfc.java
index 1d90f7cffb..e061d2b79d 100644
--- a/so-simulator/src/main/java/org/onap/so/simulator/actions/aai/ProcessVnfc.java
+++ b/so-simulator/src/main/java/org/onap/so/simulator/actions/aai/ProcessVnfc.java
@@ -49,7 +49,7 @@ public class ProcessVnfc extends AbstractTestAction {
                     aaiResourceClient.create(vnfcURI, vnfc);
                 AAIResourceUri vfModuleURI = AAIUriFactory.createResourceUri(AAIObjectType.VF_MODULE,
                         context.getVariable("vnfId"), context.getVariable("vfModuleId"));
-                AAIResourceUri pserverURI = AAIUriFactory.createResourceUri(AAIObjectType.PSERVER, "rdm52r19c001");
+                AAIResourceUri pserverURI = AAIUriFactory.createResourceUri(AAIObjectType.PSERVER, "test");
                 AAIResourceUri vserverURI = AAIUriFactory.createResourceUri(AAIObjectType.VSERVER,
                         context.getVariable("cloudOwner"), context.getVariable("cloudRegion"),
                         context.getVariable("tenant"), "d29f3151-592d-4011-9356-ad047794e236");
diff --git a/so-simulator/src/main/resources/openstack/gr_api/GetNeutronNetwork2.json b/so-simulator/src/main/resources/openstack/gr_api/GetNeutronNetwork2.json
index c66fecb8cd..725c896b8d 100644
--- a/so-simulator/src/main/resources/openstack/gr_api/GetNeutronNetwork2.json
+++ b/so-simulator/src/main/resources/openstack/gr_api/GetNeutronNetwork2.json
@@ -43,10 +43,10 @@
             "port_filter": false,
             "vlan": "181"
         },
-        "binding:vnic_type": "direct",
+        "binding:vnic_type": "normal",
         "binding:vif_type": "hw_veb",
         "mac_address": "fa:16:3e:0c:29:94",
         "project_id": "872f331350c54e59991a8de2cbffb40c",
         "created_at": "2019-02-11T19:11:39Z"
     }
-}
\ No newline at end of file
+}
diff --git a/so-simulator/src/main/resources/openstack/gr_api/GetNovaServer.json b/so-simulator/src/main/resources/openstack/gr_api/GetNovaServer.json
index 82158772e4..622bf8e3ef 100644
--- a/so-simulator/src/main/resources/openstack/gr_api/GetNovaServer.json
+++ b/so-simulator/src/main/resources/openstack/gr_api/GetNovaServer.json
@@ -62,7 +62,7 @@
         "status": "ACTIVE",
         "updated": "2019-02-11T19:12:46Z",
         "hostId": "50197c55fc934e7b3947e17db762f0839320f94983df774d84991ad2",
-        "OS-EXT-SRV-ATTR:host": "rdm52r19c001",
+        "OS-EXT-SRV-ATTR:host": "test",
         "OS-SRV-USG:terminated_at": null,
         "key_name": null,
         "OS-EXT-SRV-ATTR:hypervisor_hostname": "test.com",
@@ -72,4 +72,4 @@
         "os-extended-volumes:volumes_attached": [],
         "config_drive": "True"
     }
-}
\ No newline at end of file
+}