Merge "if audit fails write sub interface data to a ai"

12 files changed, 1787 insertions, 42 deletions

diff --git a/adapters/mso-openstack-adapters/src/test/resources/AuditResultsMissSub.json b/adapters/mso-openstack-adapters/src/test/resources/AuditResultsMissSub.json
new file mode 100644
index 0000000000..13b0d6ae43
--- /dev/null
+++ b/adapters/mso-openstack-adapters/src/test/resources/AuditResultsMissSub.json
@@ -0,0 +1,604 @@
+{
+  "auditList": [
+    {
+      "aaiObject": {
+        "inMaint": null, 
+        "isClosedLoopDisabled": null, 
+        "linterfaces": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "volumes": null, 
+        "vserverId": "92272b67-d23f-42ca-87fa-7b06a9ec81f3", 
+        "vserverName": null, 
+        "vserverName2": null, 
+        "vserverSelflink": null
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": null, 
+        "interfaceDescription": null, 
+        "interfaceId": "d2f51f82-0ec2-4581-bd1a-d2a82073e52b", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_trusted_port", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": null, 
+        "isPortMirrored": null, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": null, 
+        "macaddr": null, 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": null
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_trusted_port"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": null, 
+        "interfaceDescription": null, 
+        "interfaceId": "27391d94-33af-474a-927d-d409249e8fd3", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_svc2_port_0", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": null, 
+        "isPortMirrored": null, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "adminStatus": null, 
+              "allowedAddressPairs": null, 
+              "inMaint": false, 
+              "interfaceDescription": null, 
+              "interfaceId": "d54dfd09-75c6-4e04-b204-909455b8f933", 
+              "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101", 
+              "interfaceRole": null, 
+              "isIpUnnumbered": false, 
+              "isPortMirrored": false, 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": [], 
+              "linterfaces": null, 
+              "macaddr": "02:27:39:1d:94:33", 
+              "managementOption": null, 
+              "networkName": null, 
+              "priority": null, 
+              "provStatus": null, 
+              "relationshipList": null, 
+              "resourceVersion": null, 
+              "selflink": null, 
+              "sriovVfs": null, 
+              "v6WanLinkIp": null, 
+              "vlans": {
+                "vlan": [
+                  {
+                    "backdoorConnection": null, 
+                    "inMaint": false, 
+                    "isIpUnnumbered": false, 
+                    "isPrivate": null, 
+                    "l3InterfaceIpv4AddressList": [], 
+                    "l3InterfaceIpv6AddressList": [], 
+                    "orchestrationStatus": null, 
+                    "provStatus": null, 
+                    "relationshipList": null, 
+                    "resourceVersion": null, 
+                    "speedUnits": null, 
+                    "speedValue": null, 
+                    "vlanDescription": null, 
+                    "vlanIdInner": 101, 
+                    "vlanIdOuter": null, 
+                    "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101", 
+                    "vpnKey": null
+                  }
+                ]
+              }
+            }, 
+            {
+              "adminStatus": null, 
+              "allowedAddressPairs": null, 
+              "inMaint": false, 
+              "interfaceDescription": null, 
+              "interfaceId": "f7a998c0-8939-4b07-bf4a-0862e9c325e1", 
+              "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101", 
+              "interfaceRole": null, 
+              "isIpUnnumbered": false, 
+              "isPortMirrored": false, 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": [], 
+              "linterfaces": null, 
+              "macaddr": "02:27:39:1d:94:33", 
+              "managementOption": null, 
+              "networkName": null, 
+              "priority": null, 
+              "provStatus": null, 
+              "relationshipList": null, 
+              "resourceVersion": null, 
+              "selflink": null, 
+              "sriovVfs": null, 
+              "v6WanLinkIp": null, 
+              "vlans": {
+                "vlan": [
+                  {
+                    "backdoorConnection": null, 
+                    "inMaint": false, 
+                    "isIpUnnumbered": false, 
+                    "isPrivate": null, 
+                    "l3InterfaceIpv4AddressList": [], 
+                    "l3InterfaceIpv6AddressList": [], 
+                    "orchestrationStatus": null, 
+                    "provStatus": null, 
+                    "relationshipList": null, 
+                    "resourceVersion": null, 
+                    "speedUnits": null, 
+                    "speedValue": null, 
+                    "vlanDescription": null, 
+                    "vlanIdInner": 101, 
+                    "vlanIdOuter": null, 
+                    "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101", 
+                    "vpnKey": null
+                  }
+                ]
+              }
+            }, 
+            {
+              "adminStatus": null, 
+              "allowedAddressPairs": null, 
+              "inMaint": false, 
+              "interfaceDescription": null, 
+              "interfaceId": "621c1fea-60b8-44ee-aede-c01b8b1aaa70", 
+              "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_103", 
+              "interfaceRole": null, 
+              "isIpUnnumbered": false, 
+              "isPortMirrored": false, 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": [], 
+              "linterfaces": null, 
+              "macaddr": "02:27:39:1d:94:33", 
+              "managementOption": null, 
+              "networkName": null, 
+              "priority": null, 
+              "provStatus": null, 
+              "relationshipList": null, 
+              "resourceVersion": null, 
+              "selflink": null, 
+              "sriovVfs": null, 
+              "v6WanLinkIp": null, 
+              "vlans": {
+                "vlan": [
+                  {
+                    "backdoorConnection": null, 
+                    "inMaint": false, 
+                    "isIpUnnumbered": false, 
+                    "isPrivate": null, 
+                    "l3InterfaceIpv4AddressList": [], 
+                    "l3InterfaceIpv6AddressList": [], 
+                    "orchestrationStatus": null, 
+                    "provStatus": null, 
+                    "relationshipList": null, 
+                    "resourceVersion": null, 
+                    "speedUnits": null, 
+                    "speedValue": null, 
+                    "vlanDescription": null, 
+                    "vlanIdInner": 103, 
+                    "vlanIdOuter": null, 
+                    "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_103", 
+                    "vpnKey": null
+                  }
+                ]
+              }
+            }
+          ]
+        }, 
+        "macaddr": null, 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": null
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_svc2_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": false, 
+        "interfaceDescription": null, 
+        "interfaceId": "d54dfd09-75c6-4e04-b204-909455b8f933", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": false, 
+        "isPortMirrored": false, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": null, 
+        "macaddr": "02:27:39:1d:94:33", 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": {
+          "vlan": [
+            {
+              "backdoorConnection": null, 
+              "inMaint": false, 
+              "isIpUnnumbered": false, 
+              "isPrivate": null, 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": [], 
+              "orchestrationStatus": null, 
+              "provStatus": null, 
+              "relationshipList": null, 
+              "resourceVersion": null, 
+              "speedUnits": null, 
+              "speedValue": null, 
+              "vlanDescription": null, 
+              "vlanIdInner": 101, 
+              "vlanIdOuter": null, 
+              "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101", 
+              "vpnKey": null
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_svc2_port_0/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": false, 
+        "interfaceDescription": null, 
+        "interfaceId": "f7a998c0-8939-4b07-bf4a-0862e9c325e1", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": false, 
+        "isPortMirrored": false, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": null, 
+        "macaddr": "02:27:39:1d:94:33", 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": {
+          "vlan": [
+            {
+              "backdoorConnection": null, 
+              "inMaint": false, 
+              "isIpUnnumbered": false, 
+              "isPrivate": null, 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": [], 
+              "orchestrationStatus": null, 
+              "provStatus": null, 
+              "relationshipList": null, 
+              "resourceVersion": null, 
+              "speedUnits": null, 
+              "speedValue": null, 
+              "vlanDescription": null, 
+              "vlanIdInner": 101, 
+              "vlanIdOuter": null, 
+              "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101", 
+              "vpnKey": null
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_svc2_port_0/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_101"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": false, 
+        "interfaceDescription": null, 
+        "interfaceId": "621c1fea-60b8-44ee-aede-c01b8b1aaa70", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_103", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": false, 
+        "isPortMirrored": false, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": null, 
+        "macaddr": "02:27:39:1d:94:33", 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": {
+          "vlan": [
+            {
+              "backdoorConnection": null, 
+              "inMaint": false, 
+              "isIpUnnumbered": false, 
+              "isPrivate": null, 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": [], 
+              "orchestrationStatus": null, 
+              "provStatus": null, 
+              "relationshipList": null, 
+              "resourceVersion": null, 
+              "speedUnits": null, 
+              "speedValue": null, 
+              "vlanDescription": null, 
+              "vlanIdInner": 103, 
+              "vlanIdOuter": null, 
+              "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_103", 
+              "vpnKey": null
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_svc2_port_0/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_subint_untrusted_svc2_103"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": null, 
+        "interfaceDescription": null, 
+        "interfaceId": "07f5b14c-147a-4d14-8c94-a9e94dbc097b", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_mgmt_port_1", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": null, 
+        "isPortMirrored": null, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": null, 
+        "macaddr": null, 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": null
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_mgmt_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": null, 
+        "interfaceDescription": null, 
+        "interfaceId": "8d93f63e-e972-48c7-ad98-b2122da47315", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_mgmt_port_0", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": null, 
+        "isPortMirrored": null, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": null, 
+        "macaddr": null, 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": null
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_mgmt_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": null, 
+        "interfaceDescription": null, 
+        "interfaceId": "0594a2f2-7ea4-42eb-abc2-48ea49677fca", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_svc1_port_0", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": null, 
+        "isPortMirrored": null, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "adminStatus": null, 
+              "allowedAddressPairs": null, 
+              "inMaint": false, 
+              "interfaceDescription": null, 
+              "interfaceId": "2bbfa345-33bb-495a-94b2-fb514ee1cffc", 
+              "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc1_81", 
+              "interfaceRole": null, 
+              "isIpUnnumbered": false, 
+              "isPortMirrored": false, 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": [], 
+              "linterfaces": null, 
+              "macaddr": "02:05:94:a2:f2:7e", 
+              "managementOption": null, 
+              "networkName": null, 
+              "priority": null, 
+              "provStatus": null, 
+              "relationshipList": null, 
+              "resourceVersion": null, 
+              "selflink": null, 
+              "sriovVfs": null, 
+              "v6WanLinkIp": null, 
+              "vlans": {
+                "vlan": [
+                  {
+                    "backdoorConnection": null, 
+                    "inMaint": false, 
+                    "isIpUnnumbered": false, 
+                    "isPrivate": null, 
+                    "l3InterfaceIpv4AddressList": [], 
+                    "l3InterfaceIpv6AddressList": [], 
+                    "orchestrationStatus": null, 
+                    "provStatus": null, 
+                    "relationshipList": null, 
+                    "resourceVersion": null, 
+                    "speedUnits": null, 
+                    "speedValue": null, 
+                    "vlanDescription": null, 
+                    "vlanIdInner": 81, 
+                    "vlanIdOuter": null, 
+                    "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc1_81", 
+                    "vpnKey": null
+                  }
+                ]
+              }
+            }
+          ]
+        }, 
+        "macaddr": null, 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": null
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_svc1_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": false, 
+        "interfaceDescription": null, 
+        "interfaceId": "2bbfa345-33bb-495a-94b2-fb514ee1cffc", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc1_81", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": false, 
+        "isPortMirrored": false, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": null, 
+        "macaddr": "02:05:94:a2:f2:7e", 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": {
+          "vlan": [
+            {
+              "backdoorConnection": null, 
+              "inMaint": false, 
+              "isIpUnnumbered": false, 
+              "isPrivate": null, 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": [], 
+              "orchestrationStatus": null, 
+              "provStatus": null, 
+              "relationshipList": null, 
+              "resourceVersion": null, 
+              "speedUnits": null, 
+              "speedValue": null, 
+              "vlanDescription": null, 
+              "vlanIdInner": 81, 
+              "vlanIdOuter": null, 
+              "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_svc1_81", 
+              "vpnKey": null
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_svc1_port_0/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_subint_untrusted_svc1_81"
+    }, 
+    {
+      "aaiObject": {
+        "adminStatus": null, 
+        "allowedAddressPairs": null, 
+        "inMaint": null, 
+        "interfaceDescription": null, 
+        "interfaceId": "00bb8407-650e-48b5-b919-33b88d6f8fe3", 
+        "interfaceName": "tsbc0005v_tsbc0005vm002_int_ha_port_0", 
+        "interfaceRole": null, 
+        "isIpUnnumbered": null, 
+        "isPortMirrored": null, 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": null, 
+        "macaddr": null, 
+        "managementOption": null, 
+        "networkName": null, 
+        "priority": null, 
+        "provStatus": null, 
+        "relationshipList": null, 
+        "resourceVersion": null, 
+        "selflink": null, 
+        "sriovVfs": null, 
+        "v6WanLinkIp": null, 
+        "vlans": null
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/regionOne/tenants/tenant/0422ffb57ba042c0800a29dc85ca70f8/vservers/vserver/92272b67-d23f-42ca-87fa-7b06a9ec81f3/l-interfaces/l-interface/tsbc0005v_tsbc0005vm002_int_ha_port_0"
+    }
+  ]
+}
diff --git a/adapters/mso-openstack-adapters/src/test/resources/ExpectedVServerFound.json b/adapters/mso-openstack-adapters/src/test/resources/ExpectedVServerFound.json
new file mode 100644
index 0000000000..1f8e58ab5b
--- /dev/null
+++ b/adapters/mso-openstack-adapters/src/test/resources/ExpectedVServerFound.json
@@ -0,0 +1,167 @@
+{
+  "auditList": [
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz1", 
+        "interfaceName": "test_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz2", 
+        "interfaceName": "test_port_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_2"
+    }, 
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "dec8bdc7-5718-41dc-bfbb-561ff6eeb81c", 
+        "interfaceName": "ssc_1_trusted_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_trusted_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "1c56a24b-5f03-435a-850d-31cd4252de56", 
+        "interfaceName": "ssc_1_service1_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+              "interfaceName": "service1_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }, 
+            {
+              "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+              "interfaceName": "service1_sub_interface_2", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+        "interfaceName": "service1_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+        "interfaceName": "service1_sub_interface_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_2"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "12afcd28-929f-4d80-8a5a-0833bfd5e20b", 
+        "interfaceName": "ssc_1_mgmt_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "80baec42-ffae-425f-ad8c-3f7b2c24bfff", 
+        "interfaceName": "ssc_1_mgmt_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "13eddf95-4cf3-45f2-823a-2d890a6549b4", 
+        "interfaceName": "ssc_1_service2_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+              "interfaceName": "service2_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+        "interfaceName": "service2_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0/l-interfaces/l-interface/service2_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adb8", 
+        "interfaceName": "ssc_1_int_ha_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_int_ha_port_0"
+    }
+  ]
+}
diff --git a/adapters/mso-openstack-adapters/src/test/resources/ExpectedVserversToAudit.json b/adapters/mso-openstack-adapters/src/test/resources/ExpectedVserversToAudit.json
new file mode 100644
index 0000000000..96fe500cc2
--- /dev/null
+++ b/adapters/mso-openstack-adapters/src/test/resources/ExpectedVserversToAudit.json
@@ -0,0 +1,135 @@
+[
+  {
+    "linterfaces": {
+      "linterface": [
+        {
+          "interfaceId": "7ee06d9d-3d18-411c-9d3e-aec930f70413", 
+          "l3InterfaceIpv4AddressList": [], 
+          "l3InterfaceIpv6AddressList": []
+        }, 
+        {
+          "interfaceId": "27391d94-33af-474a-927d-d409249e8fd3", 
+          "l3InterfaceIpv4AddressList": [], 
+          "l3InterfaceIpv6AddressList": [], 
+          "linterfaces": {
+            "linterface": [
+              {
+                "inMaint": false, 
+                "interfaceId": "d54dfd09-75c6-4e04-b204-909455b8f933", 
+                "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_service1_101", 
+                "isIpUnnumbered": false, 
+                "isPortMirrored": false, 
+                "l3InterfaceIpv4AddressList": [], 
+                "l3InterfaceIpv6AddressList": [], 
+                "macaddr": "02:27:39:1d:94:33", 
+                "vlans": {
+                  "vlan": [
+                    {
+                      "inMaint": false, 
+                      "isIpUnnumbered": false, 
+                      "l3InterfaceIpv4AddressList": [], 
+                      "l3InterfaceIpv6AddressList": [], 
+                      "vlanIdInner": 101, 
+                      "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_service1_101"
+                    }
+                  ]
+                }
+              }, 
+              {
+                "inMaint": false, 
+                "interfaceId": "f7a998c0-8939-4b07-bf4a-0862e9c325e1", 
+                "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_service1_101", 
+                "isIpUnnumbered": false, 
+                "isPortMirrored": false, 
+                "l3InterfaceIpv4AddressList": [], 
+                "l3InterfaceIpv6AddressList": [], 
+                "macaddr": "02:27:39:1d:94:33", 
+                "vlans": {
+                  "vlan": [
+                    {
+                      "inMaint": false, 
+                      "isIpUnnumbered": false, 
+                      "l3InterfaceIpv4AddressList": [], 
+                      "l3InterfaceIpv6AddressList": [], 
+                      "vlanIdInner": 101, 
+                      "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_service1_101"
+                    }
+                  ]
+                }
+              }, 
+              {
+                "inMaint": false, 
+                "interfaceId": "621c1fea-60b8-44ee-aede-c01b8b1aaa70", 
+                "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_service1_103", 
+                "isIpUnnumbered": false, 
+                "isPortMirrored": false, 
+                "l3InterfaceIpv4AddressList": [], 
+                "l3InterfaceIpv6AddressList": [], 
+                "macaddr": "02:27:39:1d:94:33", 
+                "vlans": {
+                  "vlan": [
+                    {
+                      "inMaint": false, 
+                      "isIpUnnumbered": false, 
+                      "l3InterfaceIpv4AddressList": [], 
+                      "l3InterfaceIpv6AddressList": [], 
+                      "vlanIdInner": 103, 
+                      "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_service1_103"
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        }, 
+        {
+          "interfaceId": "fdeedf37-c01e-4ab0-bdd6-8d5fc4913943", 
+          "l3InterfaceIpv4AddressList": [], 
+          "l3InterfaceIpv6AddressList": []
+        }, 
+        {
+          "interfaceId": "8d93f63e-e972-48c7-ad98-b2122da47315", 
+          "l3InterfaceIpv4AddressList": [], 
+          "l3InterfaceIpv6AddressList": []
+        }, 
+        {
+          "interfaceId": "0594a2f2-7ea4-42eb-abc2-48ea49677fca", 
+          "l3InterfaceIpv4AddressList": [], 
+          "l3InterfaceIpv6AddressList": [], 
+          "linterfaces": {
+            "linterface": [
+              {
+                "inMaint": false, 
+                "interfaceId": "2bbfa345-33bb-495a-94b2-fb514ee1cffc", 
+                "interfaceName": "tsbc0005v_tsbc0005vm002_subint_untrusted_service2_81", 
+                "isIpUnnumbered": false, 
+                "isPortMirrored": false, 
+                "l3InterfaceIpv4AddressList": [], 
+                "l3InterfaceIpv6AddressList": [], 
+                "macaddr": "02:05:94:a2:f2:7e", 
+                "vlans": {
+                  "vlan": [
+                    {
+                      "inMaint": false, 
+                      "isIpUnnumbered": false, 
+                      "l3InterfaceIpv4AddressList": [], 
+                      "l3InterfaceIpv6AddressList": [], 
+                      "vlanIdInner": 81, 
+                      "vlanInterface": "tsbc0005v_tsbc0005vm002_subint_untrusted_service2_81"
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        }, 
+        {
+          "interfaceId": "00bb8407-650e-48b5-b919-33b88d6f8fe3", 
+          "l3InterfaceIpv4AddressList": [], 
+          "l3InterfaceIpv6AddressList": []
+        }
+      ]
+    }, 
+    "vserverId": "92272b67-d23f-42ca-87fa-7b06a9ec81f3"
+  }
+]
diff --git a/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface0Resources.json b/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface0Resources.json
index 0f3f35418e..d4745bec9f 100644
--- a/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface0Resources.json
+++ b/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface0Resources.json
@@ -4,23 +4,23 @@
     "resources": [
         {
             "parent_resource": "0",
-            "resource_name": "ssc_subint_mis_vmi_0",
+            "resource_name": "ssc_subint_svc1_vmi_0",
             "links": [
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_mis_vmi_0",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_svc1_vmi_0",
                     "rel": "self"
                 },
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
                     "rel": "stack"
                 }
             ],
-            "logical_resource_id": "ssc_subint_mis_vmi_0",
+            "logical_resource_id": "ssc_subint_svc1_vmi_0",
             "resource_status": "CREATE_COMPLETE",
             "updated_time": "2019-01-23T19:34:56Z",
             "required_by": [
-                "ssc_subint_mis_vmi_0_v6_ip_0",
-                "ssc_subint_mis_vmi_0_ip_0"
+                "ssc_subint_svc1_vmi_0_v6_ip_0",
+                "ssc_subint_svc1_vmi_0_ip_0"
             ],
             "resource_status_reason": "state changed",
             "physical_resource_id": "d54dfd09-75c6-4e04-b204-909455b8f933",
@@ -28,18 +28,18 @@
         },
         {
             "parent_resource": "0",
-            "resource_name": "ssc_subint_mis_vmi_0_v6_ip_0",
+            "resource_name": "ssc_subint_svc1_vmi_0_v6_ip_0",
             "links": [
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_mis_vmi_0_v6_ip_0",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_svc1_vmi_0_v6_ip_0",
                     "rel": "self"
                 },
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
                     "rel": "stack"
                 }
             ],
-            "logical_resource_id": "ssc_subint_mis_vmi_0_v6_ip_0",
+            "logical_resource_id": "ssc_subint_svc1_vmi_0_v6_ip_0",
             "resource_status": "CREATE_COMPLETE",
             "updated_time": "2019-01-23T19:34:56Z",
             "required_by": [],
@@ -49,18 +49,18 @@
         },
         {
             "parent_resource": "0",
-            "resource_name": "ssc_subint_mis_vmi_0_ip_0",
+            "resource_name": "ssc_subint_svc1_vmi_0_ip_0",
             "links": [
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_mis_vmi_0_ip_0",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_svc1_vmi_0_ip_0",
                     "rel": "self"
                 },
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
                     "rel": "stack"
                 }
             ],
-            "logical_resource_id": "ssc_subint_mis_vmi_0_ip_0",
+            "logical_resource_id": "ssc_subint_svc1_vmi_0_ip_0",
             "resource_status": "CREATE_COMPLETE",
             "updated_time": "2019-01-23T19:34:56Z",
             "required_by": [],
diff --git a/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface1Resources.json b/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface1Resources.json
index cfc4d7fed6..68d3e0f880 100644
--- a/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface1Resources.json
+++ b/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface1Resources.json
@@ -4,23 +4,23 @@
     "resources": [
         {
             "parent_resource": "0",
-            "resource_name": "ssc_subint_mis_vmi_0",
+            "resource_name": "ssc_subint_svc1_vmi_0",
             "links": [
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_mis_vmi_0",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_svc1_vmi_0",
                     "rel": "self"
                 },
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
                     "rel": "stack"
                 }
             ],
-            "logical_resource_id": "ssc_subint_mis_vmi_0",
+            "logical_resource_id": "ssc_subint_svc1_vmi_0",
             "resource_status": "CREATE_COMPLETE",
             "updated_time": "2019-01-23T19:34:56Z",
             "required_by": [
-                "ssc_subint_mis_vmi_0_v6_ip_0",
-                "ssc_subint_mis_vmi_0_ip_0"
+                "ssc_subint_svc1_vmi_0_v6_ip_0",
+                "ssc_subint_svc1_vmi_0_ip_0"
             ],
             "resource_status_reason": "state changed",
             "physical_resource_id": "f7a998c0-8939-4b07-bf4a-0862e9c325e1",
@@ -28,18 +28,18 @@
         },
         {
             "parent_resource": "0",
-            "resource_name": "ssc_subint_mis_vmi_0_v6_ip_0",
+            "resource_name": "ssc_subint_svc1_vmi_0_v6_ip_0",
             "links": [
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_mis_vmi_0_v6_ip_0",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_svc1_vmi_0_v6_ip_0",
                     "rel": "self"
                 },
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
                     "rel": "stack"
                 }
             ],
-            "logical_resource_id": "ssc_subint_mis_vmi_0_v6_ip_0",
+            "logical_resource_id": "ssc_subint_svc1_vmi_0_v6_ip_0",
             "resource_status": "CREATE_COMPLETE",
             "updated_time": "2019-01-23T19:34:56Z",
             "required_by": [],
@@ -49,18 +49,18 @@
         },
         {
             "parent_resource": "0",
-            "resource_name": "ssc_subint_mis_vmi_0_ip_0",
+            "resource_name": "ssc_subint_svc1_vmi_0_ip_0",
             "links": [
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_mis_vmi_0_ip_0",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_svc1_vmi_0_ip_0",
                     "rel": "self"
                 },
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
                     "rel": "stack"
                 }
             ],
-            "logical_resource_id": "ssc_subint_mis_vmi_0_ip_0",
+            "logical_resource_id": "ssc_subint_svc1_vmi_0_ip_0",
             "resource_status": "CREATE_COMPLETE",
             "updated_time": "2019-01-23T19:34:56Z",
             "required_by": [],
diff --git a/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface2Resources.json b/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface2Resources.json
index e8aa80eb6f..4f4d25d96b 100644
--- a/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface2Resources.json
+++ b/adapters/mso-openstack-adapters/src/test/resources/Service1SubInterface2Resources.json
@@ -4,23 +4,23 @@
     "resources": [
         {
             "parent_resource": "0",
-            "resource_name": "ssc_subint_mis_vmi_0",
+            "resource_name": "ssc_subint_svc1_vmi_0",
             "links": [
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_mis_vmi_0",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_svc1_vmi_0",
                     "rel": "self"
                 },
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
                     "rel": "stack"
                 }
             ],
-            "logical_resource_id": "ssc_subint_mis_vmi_0",
+            "logical_resource_id": "ssc_subint_svc1_vmi_0",
             "resource_status": "CREATE_COMPLETE",
             "updated_time": "2019-01-23T19:34:56Z",
             "required_by": [
-                "ssc_subint_mis_vmi_0_v6_ip_0",
-                "ssc_subint_mis_vmi_0_ip_0"
+                "ssc_subint_svc1_vmi_0_v6_ip_0",
+                "ssc_subint_svc1_vmi_0_ip_0"
             ],
             "resource_status_reason": "state changed",
             "physical_resource_id": "621c1fea-60b8-44ee-aede-c01b8b1aaa70",
@@ -28,18 +28,18 @@
         },
         {
             "parent_resource": "0",
-            "resource_name": "ssc_subint_mis_vmi_0_v6_ip_0",
+            "resource_name": "ssc_subint_svc1_vmi_0_v6_ip_0",
             "links": [
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_mis_vmi_0_v6_ip_0",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_svc1_vmi_0_v6_ip_0",
                     "rel": "self"
                 },
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
                     "rel": "stack"
                 }
             ],
-            "logical_resource_id": "ssc_subint_mis_vmi_0_v6_ip_0",
+            "logical_resource_id": "ssc_subint_svc1_vmi_0_v6_ip_0",
             "resource_status": "CREATE_COMPLETE",
             "updated_time": "2019-01-23T19:34:56Z",
             "required_by": [],
@@ -49,18 +49,18 @@
         },
         {
             "parent_resource": "0",
-            "resource_name": "ssc_subint_mis_vmi_0_ip_0",
+            "resource_name": "ssc_subint_svc1_vmi_0_ip_0",
             "links": [
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_mis_vmi_0_ip_0",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81/resources/ssc_subint_svc1_vmi_0_ip_0",
                     "rel": "self"
                 },
                 {
-                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_mis_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
+                    "href": "https://orchestration.com:8004/v1/ea2d13cc98b44d60a6f94bdcb2738f9e/stacks/tsbc0005vm002ssc001-ssc_1_subint_svc1_port_0_subinterfaces-hlzdigtimzst-0-upfi5nhurk7y/f711be16-2654-4a09-b89d-0511fda20e81",
                     "rel": "stack"
                 }
             ],
-            "logical_resource_id": "ssc_subint_mis_vmi_0_ip_0",
+            "logical_resource_id": "ssc_subint_svc1_vmi_0_ip_0",
             "resource_status": "CREATE_COMPLETE",
             "updated_time": "2019-01-23T19:34:56Z",
             "required_by": [],
diff --git a/adapters/mso-openstack-adapters/src/test/resources/VServer_Found_Network_Sec_Server_Not_Found.json b/adapters/mso-openstack-adapters/src/test/resources/VServer_Found_Network_Sec_Server_Not_Found.json
new file mode 100644
index 0000000000..d13b4b7672
--- /dev/null
+++ b/adapters/mso-openstack-adapters/src/test/resources/VServer_Found_Network_Sec_Server_Not_Found.json
@@ -0,0 +1,167 @@
+{
+  "auditList": [
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "dec8bdc7-5718-41dc-bfbb-561ff6eeb81c", 
+        "interfaceName": "ssc_1_trusted_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_trusted_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "1c56a24b-5f03-435a-850d-31cd4252de56", 
+        "interfaceName": "ssc_1_service1_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+              "interfaceName": "service1_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }, 
+            {
+              "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+              "interfaceName": "service1_sub_interface_2", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+        "interfaceName": "service1_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+        "interfaceName": "service1_sub_interface_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_2"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "12afcd28-929f-4d80-8a5a-0833bfd5e20b", 
+        "interfaceName": "ssc_1_mgmt_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "80baec42-ffae-425f-ad8c-3f7b2c24bfff", 
+        "interfaceName": "ssc_1_mgmt_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "13eddf95-4cf3-45f2-823a-2d890a6549b4", 
+        "interfaceName": "ssc_1_service2_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+              "interfaceName": "service2_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+        "interfaceName": "service2_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0/l-interfaces/l-interface/service2_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adb8", 
+        "interfaceName": "ssc_1_int_ha_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_int_ha_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz1", 
+        "interfaceName": "test_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz2", 
+        "interfaceName": "test_port_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_2"
+    }
+  ]
+}
diff --git a/adapters/mso-openstack-adapters/src/test/resources/VServer_Found_Sec_Server_Not_Found2.json b/adapters/mso-openstack-adapters/src/test/resources/VServer_Found_Sec_Server_Not_Found2.json
new file mode 100644
index 0000000000..eb0fb7ca76
--- /dev/null
+++ b/adapters/mso-openstack-adapters/src/test/resources/VServer_Found_Sec_Server_Not_Found2.json
@@ -0,0 +1,167 @@
+{
+  "auditList": [
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "dec8bdc7-5718-41dc-bfbb-561ff6eeb81c", 
+        "interfaceName": "ssc_1_trusted_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_trusted_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "1c56a24b-5f03-435a-850d-31cd4252de56", 
+        "interfaceName": "ssc_1_service1_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+              "interfaceName": "service1_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }, 
+            {
+              "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+              "interfaceName": "service1_sub_interface_2", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+        "interfaceName": "service1_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+        "interfaceName": "service1_sub_interface_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_2"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "12afcd28-929f-4d80-8a5a-0833bfd5e20b", 
+        "interfaceName": "ssc_1_mgmt_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "80baec42-ffae-425f-ad8c-3f7b2c24bfff", 
+        "interfaceName": "ssc_1_mgmt_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "13eddf95-4cf3-45f2-823a-2d890a6549b4", 
+        "interfaceName": "ssc_1_service2_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+              "interfaceName": "service2_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+        "interfaceName": "service2_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0/l-interfaces/l-interface/service2_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adb8", 
+        "interfaceName": "ssc_1_int_ha_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_int_ha_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz1", 
+        "interfaceName": "test_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz2", 
+        "interfaceName": "test_port_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_2"
+    }
+  ]
+}
diff --git a/adapters/mso-openstack-adapters/src/test/resources/VServer_Found_network_Not_Found.json b/adapters/mso-openstack-adapters/src/test/resources/VServer_Found_network_Not_Found.json
new file mode 100644
index 0000000000..0cb47dcb5e
--- /dev/null
+++ b/adapters/mso-openstack-adapters/src/test/resources/VServer_Found_network_Not_Found.json
@@ -0,0 +1,167 @@
+{
+  "auditList": [
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz1", 
+        "interfaceName": "test_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz2", 
+        "interfaceName": "test_port_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_2"
+    }, 
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "dec8bdc7-5718-41dc-bfbb-561ff6eeb81c", 
+        "interfaceName": "ssc_1_trusted_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_trusted_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "1c56a24b-5f03-435a-850d-31cd4252de56", 
+        "interfaceName": "ssc_1_service1_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+              "interfaceName": "service1_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }, 
+            {
+              "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+              "interfaceName": "service1_sub_interface_2", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+        "interfaceName": "service1_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+        "interfaceName": "service1_sub_interface_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_2"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "12afcd28-929f-4d80-8a5a-0833bfd5e20b", 
+        "interfaceName": "ssc_1_mgmt_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "80baec42-ffae-425f-ad8c-3f7b2c24bfff", 
+        "interfaceName": "ssc_1_mgmt_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "13eddf95-4cf3-45f2-823a-2d890a6549b4", 
+        "interfaceName": "ssc_1_service2_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+              "interfaceName": "service2_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+        "interfaceName": "service2_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0/l-interfaces/l-interface/service2_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adb8", 
+        "interfaceName": "ssc_1_int_ha_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_int_ha_port_0"
+    }
+  ]
+}
diff --git a/adapters/mso-openstack-adapters/src/test/resources/Vserver2_Found_VServer1_Not_Found.json b/adapters/mso-openstack-adapters/src/test/resources/Vserver2_Found_VServer1_Not_Found.json
new file mode 100644
index 0000000000..f3dc38d51b
--- /dev/null
+++ b/adapters/mso-openstack-adapters/src/test/resources/Vserver2_Found_VServer1_Not_Found.json
@@ -0,0 +1,167 @@
+{
+  "auditList": [
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz1", 
+        "interfaceName": "test_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz2", 
+        "interfaceName": "test_port_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": true, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_2"
+    }, 
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "dec8bdc7-5718-41dc-bfbb-561ff6eeb81c", 
+        "interfaceName": "ssc_1_trusted_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_trusted_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "1c56a24b-5f03-435a-850d-31cd4252de56", 
+        "interfaceName": "ssc_1_service1_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+              "interfaceName": "service1_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }, 
+            {
+              "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+              "interfaceName": "service1_sub_interface_2", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+        "interfaceName": "service1_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+        "interfaceName": "service1_sub_interface_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_2"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "12afcd28-929f-4d80-8a5a-0833bfd5e20b", 
+        "interfaceName": "ssc_1_mgmt_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "80baec42-ffae-425f-ad8c-3f7b2c24bfff", 
+        "interfaceName": "ssc_1_mgmt_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "13eddf95-4cf3-45f2-823a-2d890a6549b4", 
+        "interfaceName": "ssc_1_service2_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+              "interfaceName": "service2_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+        "interfaceName": "service2_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0/l-interfaces/l-interface/service2_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adb8", 
+        "interfaceName": "ssc_1_int_ha_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_int_ha_port_0"
+    }
+  ]
+}
diff --git a/adapters/mso-openstack-adapters/src/test/resources/Vservers_Not_Found.json b/adapters/mso-openstack-adapters/src/test/resources/Vservers_Not_Found.json
new file mode 100644
index 0000000000..d9089dc099
--- /dev/null
+++ b/adapters/mso-openstack-adapters/src/test/resources/Vservers_Not_Found.json
@@ -0,0 +1,167 @@
+{
+  "auditList": [
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz1", 
+        "interfaceName": "test_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adz2", 
+        "interfaceName": "test_port_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4dz/l-interfaces/l-interface/test_port_2"
+    }, 
+    {
+      "aaiObject": {
+        "vserverId": "3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+      }, 
+      "aaiObjectType": "vserver", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "dec8bdc7-5718-41dc-bfbb-561ff6eeb81c", 
+        "interfaceName": "ssc_1_trusted_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_trusted_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "1c56a24b-5f03-435a-850d-31cd4252de56", 
+        "interfaceName": "ssc_1_service1_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+              "interfaceName": "service1_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }, 
+            {
+              "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+              "interfaceName": "service1_sub_interface_2", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "0d9cd813-2ae1-46c0-9ebb-48081f6cffbb", 
+        "interfaceName": "service1_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "b7019dd0-2ee9-4447-bdef-ac25676b205a", 
+        "interfaceName": "service1_sub_interface_2", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service1_port_0/l-interfaces/l-interface/service1_sub_interface_2"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "12afcd28-929f-4d80-8a5a-0833bfd5e20b", 
+        "interfaceName": "ssc_1_mgmt_port_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "80baec42-ffae-425f-ad8c-3f7b2c24bfff", 
+        "interfaceName": "ssc_1_mgmt_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_mgmt_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "13eddf95-4cf3-45f2-823a-2d890a6549b4", 
+        "interfaceName": "ssc_1_service2_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": [], 
+        "linterfaces": {
+          "linterface": [
+            {
+              "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+              "interfaceName": "service2_sub_interface_1", 
+              "l3InterfaceIpv4AddressList": [], 
+              "l3InterfaceIpv6AddressList": []
+            }
+          ]
+        }
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "f711be16-2654-4a09-b89d-0511fda20e81", 
+        "interfaceName": "service2_sub_interface_1", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "sub-l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_service2_port_0/l-interfaces/l-interface/service2_sub_interface_1"
+    }, 
+    {
+      "aaiObject": {
+        "interfaceId": "9cab2903-70f7-44fd-b681-491d6ae2adb8", 
+        "interfaceName": "ssc_1_int_ha_port_0", 
+        "l3InterfaceIpv4AddressList": [], 
+        "l3InterfaceIpv6AddressList": []
+      }, 
+      "aaiObjectType": "l-interface", 
+      "doesObjectExist": false, 
+      "resourceURI": "/cloud-infrastructure/cloud-regions/cloud-region/cloudOwner/cloudRegion/tenants/tenant/tenantId/vservers/vserver/3a4c2ca5-27b3-4ecc-98c5-06804867c4db/l-interfaces/l-interface/ssc_1_int_ha_port_0"
+    }
+  ]
+}
diff --git a/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml b/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml
index 8da26e991e..694aedae10 100644
--- a/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml
+++ b/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml
@@ -77,6 +77,10 @@ mso:
     core-pool-size: 50
     max-pool-size: 50
     queue-capacity: 500
+    workflow:
+  topics:
+    retryMultiplier: 60000
+    retrySequence: 1, 1, 2, 3, 5, 8, 13, 20
 spring:
   datasource:
     url: jdbc:mariadb://localhost:3307/catalogdb