[SDNC-5] Rebase SDN-C oam

Apply fixes to directed graphs and docker containers discovered during
local testing

Change-Id: Ie675ecea7aa5119fb0b3ee180997b3a420be3e1b
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: 596540a90b7cd031151943062b8c259314acce93

1 files changed, 0 insertions, 74 deletions

diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml
deleted file mode 100644
index 582c5133..00000000
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-  						reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'><method rpc='vnf-topology-delete' mode='sync'>
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>
-<return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value='Other'>
-<switch test="`$service-data.oper-status.order-status == Active`"><outcome value='false'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch></outcome><outcome value=''><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-clli`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='Either aic-cloud-region or aic-clli must be present'/></return></outcome><outcome value='Other'>
-<block>
-<delete plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource"
-    resource="generic-vnf-l3-network"
-    key="DELETE FROM GENERIC_VNF_L3_NETWORK WHERE vnf_id = $service-data.vnf-id"
-    force="true" >
-
-<outcome value='failure'>
-<set>
-    <parameter name="error-code" value="500"/>
-    <parameter name="error-message" value="An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource"/></set></outcome></delete><delete plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource"
-    resource="generic-vnf-vserver"
-    key="DELETE FROM GENERIC_VNF_VSERVER where vnf_id = $service-data.vnf-id"
-    force="true" >
-
-<outcome value='failure'>
-<set>
-    <parameter name="error-code" value="500"/>
-    <parameter name="error-message" value="An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource"/></set></outcome></delete><delete plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource"
-    resource="generic-vnf"
-    key="DELETE FROM GENERIC_VNF where vnf_id = $service-data.vnf-id"
-    local-only="true"
-    force="true" >
-
-<outcome value='failure'>
-<set>
-    <parameter name="error-code" value="500"/>
-    <parameter name="error-message" value="An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource"/></set></outcome></delete><delete plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="generic-vnf"
-    key="generic-vnf.vnf-id = $service-data.vnf-id"
-    local-only="false"
-    force="true" >
-
-<outcome value='failure'>
-<return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="`'Failed to delete generic-vnf from AnAI with vnf-id = '+ $service-data.vnf-id`"/></return></outcome></delete></block></outcome></switch></outcome></switch><set>
-    <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>
-    <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>
-    <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
-    <parameter name="service-data.vnf-topology-information." value="" />
-</set><set>
-<parameter name="ack-final" value="Y"/></set><return status='success'>
-    <parameter name="error-code" value="200" /></return></block></method></service-logic>