[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, 58 deletions

diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign.xml
deleted file mode 100644
index 047f9cb5..00000000
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign.xml
+++ /dev/null
@@ -1,58 +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-instance-topology-assign' mode='sync'>
-<block atomic="true"><get-resource plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="generic-vnf"
-        key="generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id"
-    pfx="tmp.AnAI.vnf-instance" ><outcome value='failure'>
-<return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="`'An error occurred while querying generic-vnf from AnAI with vnf-instance-id = ' + $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id`"/></return></outcome><outcome value='not-found'>
-<return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="`'generic-vnf not found in AnAI with vnf-instance-id = ' + $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id`"/></return></outcome></get-resource><call module='VNF-API' rpc='vnf-instance-topology-assign-vnf-networks' mode='sync' ></call><switch test="`$vnf-instance-service-data.vnf-instance-topology-information.vnf-assignments.vnf-networks_length`"><outcome value=''><set>
-<parameter name='vnf-instance-service-data.vnf-instance-topology-information.vnf-assignments.vnf-networks_length' value='0' />
-</set></outcome></switch><for index="i" start="0" end="`$vnf-instance-service-data.vnf-instance-topology-information.vnf-assignments.vnf-networks_length`"><save plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="generic-vnf:relationship-list"
-        key="generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id" >
-    <parameter name="relationship-list.relationship[0].related-to" value="l3-network" />
-    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" />
-    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-instance-service-data.vnf-instance-topology-information.vnf-assignments.vnf-networks[$i].network-id`" /><outcome value='failure'>
-<block atomic='true'><delete plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="generic-vnf:relationship-list"
-        key="generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id
-            AND related-to = l3-network" ></delete><return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="`'An error occurred while saving generic-vnf l3-network relationship in AnAI with network-id = ' + $vnf-instance.service-data.vnf-instance-topology-information.vnf-assignments.vnf-networks[$i].network-id`"/></return></block></outcome></save></for><update plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="generic-vnf"
-        key="generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id" >
-    <parameter name="orchestration-status" value="pending-create" /><outcome value='failure'>
-<block atomic="true">
-<delete plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="generic-vnf:relationship-list"
-        key="generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id
-            AND related-to = l3-network" ></delete><return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="An error occurred while updating vnf-instance orchestration-status in AnAI"/></return></block></outcome></update><set>
-    <parameter name="vnf-instance-service-data.oper-status.order-status" value="PendingCreate"/></set><set>
-<parameter name="ack-final" value="Y"/></set><return status='success'>
-    <parameter name="error-code" value="200" /></return></block></method></service-logic>