Merge "fix maven local build issue"
authorDan Timoney <dtimoney@att.com>
Thu, 18 May 2017 19:45:51 +0000 (19:45 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 18 May 2017 19:45:51 +0000 (19:45 +0000)
Former-commit-id: 16cb8a0af0c8bb1efd1e26f0b9aeb7e1fec36dc0

48 files changed:
admportal/src/assembly/assemble_zip.xml
installation/admportal/pom.xml
installation/dgbuilder/pom.xml
installation/sdnc/pom.xml
installation/sdnc/src/main/docker/Dockerfile
installation/src/main/yaml/docker-compose.yml
installation/ubuntu/pom.xml
platform-logic/asdc-api/src/main/xml/ASDC-API_vf-license-model-update.xml
platform-logic/installer/src/assembly/assemble_zip.xml
platform-logic/installer/src/main/resources/svclogic.properties
platform-logic/installer/src/main/scripts/install.sh
platform-logic/installer/src/main/scripts/setenv.sh
platform-logic/installer/src/main/scripts/showActiveGraphs.sh
platform-logic/installer/src/main/scripts/svclogic.sh
platform-logic/sliapi/src/main/xml/sli_healthcheck.xml
platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml
platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml
platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml
platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml
platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml
platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml
platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml
platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-activate.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-changeassign.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign-vfmodule.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changedelete.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml
platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml

index de4aae8..6e06a76 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 88ac89d..c9ea1d9 100644 (file)
@@ -45,7 +45,7 @@
                                                                }
 
                                                                if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
-                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                } else {
                                                                        project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                }
index c89c766..33302bc 100644 (file)
@@ -46,7 +46,7 @@
                                                                }
 
                                                                if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
-                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                } else {
                                                                        project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                }
index b227306..960d431 100644 (file)
@@ -69,7 +69,7 @@
                                                                }
 
                                                                if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
-                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                } else {
                                                                        project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                }
index 55f74b7..debfe83 100644 (file)
@@ -20,6 +20,7 @@ COPY opt /opt
 RUN ln -s /opt/openecomp/sdnc /opt/sdnc
 
 # workaround till we get proxy working
-COPY mysql-connector-java-${sdnc.mysql-connector-java.version}.jar /opt/opendaylight/current/system
+RUN mkdir -p /opt/opendaylight/current/system/mysql/mysql-connector-java/${sdnc.mysql-connector-java.version}
+COPY mysql-connector-java-${sdnc.mysql-connector-java.version}.jar /opt/opendaylight/current/system/mysql/mysql-connector-java/${sdnc.mysql-connector-java.version}
 # ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
 EXPOSE 8181
index 932e5bb..bb9acfb 100644 (file)
@@ -1,5 +1,12 @@
 version: '2'
 
+networks:
+  default:
+    driver: bridge
+    driver_opts:
+      com.docker.network.driver.mtu: ${MTU}
+
+
 services:
   db:
     image: mysql/mysql-server:5.6
@@ -9,13 +16,13 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - MYSQL_ROOT_HOST=%
-    logging:       
+    logging:
       driver:   "json-file"
-      options:  
+      options:
         max-size: "30m"
         max-file: "5"
-  
-      
+
+
   sdnc:
     image: openecomp/sdnc-image:latest
     depends_on :
@@ -31,19 +38,19 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
-    logging:       
+    logging:
       driver:   "json-file"
-      options:  
+      options:
         max-size: "30m"
         max-file: "5"
-  
-  
+
+
   web:
     image: openecomp/admportal-sdnc-image:latest
     depends_on:
       - db
     container_name: sdnc_portal_container
-    entrypoint: 
+    entrypoint:
        - "/bin/bash"
        - "-c"
        - "cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh"
@@ -57,13 +64,13 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
-    logging:       
+    logging:
       driver:   "json-file"
-      options:  
+      options:
         max-size: "30m"
         max-file: "5"
-  
-  
+
+
   dgbuilder:
     image: openecomp/dgbuilder-sdnc-image:latest
     depends_on:
@@ -83,10 +90,10 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
-    logging:       
+    logging:
       driver:   "json-file"
-      options:  
+      options:
         max-size: "30m"
         max-file: "5"
-  
-  
+
+
index d2ff86a..17f1e0e 100644 (file)
@@ -45,7 +45,7 @@
                                                                }
 
                                                                if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
-                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                } else {
                                                                        project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                }
index cdc1efb..ef4384b 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 5e62ecb..46a8b61 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index ec4f888..0923a3e 100644 (file)
@@ -3,7 +3,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#                                              reserved.
+#                                                      reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
index efea228..2c32e93 100644 (file)
@@ -5,7 +5,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#                                              reserved.
+#                                                      reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
index aac4e57..08792bc 100644 (file)
@@ -5,7 +5,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#                                              reserved.
+#                                                      reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
index 80cb4aa..9b89e9c 100644 (file)
@@ -3,7 +3,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#                                              reserved.
+#                                                      reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
index 464a71c..b800385 100644 (file)
@@ -5,7 +5,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#                                              reserved.
+#                                                      reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
index bc57ee9..c176767 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index a08a7a2..027c29d 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 5903707..dc8e439 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 5e787c7..b9e37ff 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 006c65d..acad735 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index fd31513..5475159 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 7352d88..4edb518 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 83c181a..8301b21 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 2652e03..87d5ac3 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 3fb8483..699ccac 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index b9ed2a2..efd277b 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 7908dec..387961f 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 388939f..fef19fb 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 808fffd..bf7fe92 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 99d5240..0b44711 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 5461fa5..a55a832 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 10a265a..c9c3b2e 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index c0359f4..61b266c 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index d5e27b1..7666d51 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 88a2c63..ff1d473 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index acee4ff..9bc5bba 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 047f9cb..d2fc765 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index ff828b7..3720478 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index a7fc602..a2d84f1 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 23e915c..8d0ac4f 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 9b185f9..6e0ec55 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index 1b5ad0c..80ff4c0 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index d8c211f..b69faa6 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index b365142..15d767c 100644 (file)
@@ -1,54 +1,73 @@
-<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-assign' mode='sync'>\r
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='true'>\r
-<return status='failure'>\r
-       <parameter name='error-code' value='500'/>\r
-       <parameter name='error-message' value='vnf-id is already present in config-tree'/></return></outcome></switch><get-resource plugin="com.att.sdnctl.sli.aai.AAIService" \r
-       resource="vf-module" \r
-               key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \r
-                       and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" \r
-               local-only="false" \r
-               pfx="tmp.AnAI.vfmodule" ><outcome value='failure'>\r
-<return status='failure'>\r
-       <parameter name='error-code' value='500'/>\r
-       <parameter name='error-message' value="`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome><outcome value='not-found'>\r
-<return status='failure'>\r
-       <parameter name='error-code' value='500'/>\r
-       <parameter name='error-message' value="`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome></get-resource><call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' ></call><switch test="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><outcome value=''><set>\r
-<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' />\r
-</set></outcome></switch><for index="i" start="0" end="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><save plugin="com.att.sdnctl.sli.aai.AAIService" \r
-       resource="vf-module:relationship-list" \r
-               key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \r
-                       and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" \r
-       force="true" \r
-       local-only="false">\r
-       \r
-       <parameter name="relationship-list.relationship[0].related-to" value="l3-network" />\r
-       <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" />\r
-       <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`" /><outcome value='failure'>\r
-<block atomic='true'><delete plugin="com.att.sdnctl.sli.aai.AAIService" \r
-       resource="vf-module:relationship-list" \r
-       key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \r
-               AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \r
-               AND related-to = l3-network" \r
-       force="true" \r
-       local-only="false"></delete><return status='failure'>\r
-       <parameter name='error-code' value='500'/>\r
-       <parameter name='error-message' value="`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`"/></return></block></outcome></save></for><update plugin="com.att.sdnctl.sli.aai.AAIService" \r
-       resource="vf-module" \r
-               key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \r
-                       and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" \r
-               local-only="false" >\r
-       <parameter name="orchestration-status" value="pending-create" /><outcome value='failure'>\r
-<block atomic="true">\r
-<delete plugin="com.att.sdnctl.sli.aai.AAIService" \r
-       resource="vf-module:relationship-list" \r
-       key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \r
-               AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \r
-               AND related-to = l3-network" \r
-       force="true" \r
-       local-only="false"></delete><return status='failure'>\r
-       <parameter name='error-code' value='500'/>\r
-       <parameter name='error-message' value="Encountered error while updating vf-module orchestration-status in AnAI"/></return></block></outcome></update><set>\r
-       <parameter name="service-data.oper-status.order-status" value="PendingCreate"/></set><set>\r
-<parameter name="ack-final" value="Y"/></set><return status='success'>\r
-       <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file
+<!--
+  ============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-assign' mode='sync'>
+<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='true'>
+<return status='failure'>
+       <parameter name='error-code' value='500'/>
+       <parameter name='error-message' value='vnf-id is already present in config-tree'/></return></outcome></switch><get-resource plugin="com.att.sdnctl.sli.aai.AAIService"
+       resource="vf-module"
+               key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
+                       and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
+               local-only="false"
+               pfx="tmp.AnAI.vfmodule" ><outcome value='failure'>
+<return status='failure'>
+       <parameter name='error-code' value='500'/>
+       <parameter name='error-message' value="`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome><outcome value='not-found'>
+<return status='failure'>
+       <parameter name='error-code' value='500'/>
+       <parameter name='error-message' value="`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome></get-resource><call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' ></call><switch test="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><outcome value=''><set>
+<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' />
+</set></outcome></switch><for index="i" start="0" end="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><save plugin="com.att.sdnctl.sli.aai.AAIService"
+       resource="vf-module:relationship-list"
+               key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
+                       and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
+       force="true"
+       local-only="false">
+       
+       <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="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`" /><outcome value='failure'>
+<block atomic='true'><delete plugin="com.att.sdnctl.sli.aai.AAIService"
+       resource="vf-module:relationship-list"
+       key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
+               AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id
+               AND related-to = l3-network"
+       force="true"
+       local-only="false"></delete><return status='failure'>
+       <parameter name='error-code' value='500'/>
+       <parameter name='error-message' value="`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`"/></return></block></outcome></save></for><update plugin="com.att.sdnctl.sli.aai.AAIService"
+       resource="vf-module"
+               key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
+                       and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
+               local-only="false" >
+       <parameter name="orchestration-status" value="pending-create" /><outcome value='failure'>
+<block atomic="true">
+<delete plugin="com.att.sdnctl.sli.aai.AAIService"
+       resource="vf-module:relationship-list"
+       key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
+               AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id
+               AND related-to = l3-network"
+       force="true"
+       local-only="false"></delete><return status='failure'>
+       <parameter name='error-code' value='500'/>
+       <parameter name='error-message' value="Encountered error while updating vf-module orchestration-status in AnAI"/></return></block></outcome></update><set>
+       <parameter name="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>
index 10aaaf9..a1e7672 100644 (file)
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                               reserved.
+                                                       reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
index a16e5bb..0b57d01 100644 (file)
@@ -1,32 +1,51 @@
-<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-changedelete' mode='sync'>\r
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>\r
-<return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="'$service-data.oper-status.order-status == Active'">\r
-\r
-<!--\r
-leaf order-status {\r
-       type enumeration {\r
-               enum "Active";\r
-               enum "PendingAssignment";\r
-               enum "PendingCreate";\r
-               enum "PendingUpdate";\r
-               enum "Deleted";\r
-       }\r
-}\r
---><outcome value='false'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='Invalid last-order-status'/></return></outcome></switch><update plugin="com.att.sdnctl.sli.aai.AAIService" \r
-       resource="generic-vnf" \r
-               key="generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" \r
-       force="true" \r
-       local-only="false" >\r
-       <parameter name="orchestration-status" value="pending-delete" />\r
-</update><set>\r
-       <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>\r
-       <parameter name="service-data.oper-status.order-status" value="PendingDelete"/></set><set>\r
-       <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>\r
-       <parameter name="service-data." value="vnf-topology-operation-input." /> \r
-</set><return status='success'>\r
-       <parameter name="error-code" value="200" />\r
-</return></block></method></service-logic>\r
+<!--
+  ============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-changedelete' 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="'$service-data.oper-status.order-status == Active'">
+
+<!--
+leaf order-status {
+       type enumeration {
+               enum "Active";
+               enum "PendingAssignment";
+               enum "PendingCreate";
+               enum "PendingUpdate";
+               enum "Deleted";
+       }
+}
+--><outcome value='false'><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='Invalid last-order-status'/></return></outcome></switch><update plugin="com.att.sdnctl.sli.aai.AAIService"
+       resource="generic-vnf"
+               key="generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
+       force="true"
+       local-only="false" >
+       <parameter name="orchestration-status" value="pending-delete" />
+</update><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="PendingDelete"/></set><set>
+       <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
+       <parameter name="service-data." value="vnf-topology-operation-input." />
+</set><return status='success'>
+       <parameter name="error-code" value="200" />
+</return></block></method></service-logic>
index f44c8d2..6e6a6dc 100644 (file)
@@ -1,15 +1,34 @@
-<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'>\r
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>\r
-<return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <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'>\r
-<switch test="`$service-data.oper-status.order-status == Active`"><outcome value='false'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch></outcome></switch><set>\r
-       <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>\r
-       <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>\r
-       <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>\r
-       <parameter name="service-data." value="" /> \r
-</set><set>\r
-<parameter name="ack-final" value="Y"/></set><return status='success'>\r
-       <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file
+<!--
+  ============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></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." value="" />
+</set><set>
+<parameter name="ack-final" value="Y"/></set><return status='success'>
+       <parameter name="error-code" value="200" /></return></block></method></service-logic>
index db0f8cb..e1cd9cb 100644 (file)
-<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-operation' mode='sync'>\r
-<block atomic="true"><record plugin="com.att.sdnctl.sli.recording.FileRecorder">\r
-<parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>\r
-<parameter name="field1" value="__TIMESTAMP__"/>\r
-<parameter name="field2" value="svc-topology-operation"/>\r
-<parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action`"/>\r
-<parameter name="field4" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/>\r
-<parameter name="field5" value="`$vnf-topology-operation-input.service-information.service-instance-id`"/>\r
-<parameter name="field6" value="`$vnf-topology-operation-input.request-information.request-id`"/>\r
-<parameter name="field7" value="`$vnf-topology-operation-input.request-information.request-action`"/>\r
-<parameter name="field8" value="`$vnf-topology-operation-input.request-information.source`"/>\r
-<parameter name="field9" value="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"/>\r
-<parameter name="field10" value="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"/>\r
-<parameter name="field11" value="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"/>\r
-<parameter name="field12" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"/>\r
-<parameter name="field13" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"/>\r
-<parameter name="field14" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/>\r
-<parameter name="field15" value="`$vnf-topology-operation-input.vnf-request-information.tenant`"/>\r
-<parameter name="field16" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"/>\r
-<parameter name="field17" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"/>\r
-<parameter name="field18" value="`$preload-data.oper-status.order-status`"/></record><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='false'>\r
-<return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='request.vnf-name not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='No preload data found to match vnf-name'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='vnf-name is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='false'>\r
-<return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='request.vnf-type not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='No preload data found to match vnf-type'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='vnf-type is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"><outcome value='0'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.sdnc-request-header.svc-action`">\r
-<!--\r
-leaf svc-action { \r
-       type enumeration { \r
-               enum "reserve";\r
-               enum "assign";\r
-               enum "activate";  // equal to commit\r
-               enum "delete";    // equal to commit\r
-               enum "changeassign";\r
-               enum "changedelete";\r
-               enum "rollback";\r
-       }\r
-}\r
--->\r
-\r
-<outcome value='assign'><block>\r
-<block atomic="true">\r
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-assign' mode='sync' ></call></block></outcome><outcome value='changeassign'><block>\r
-<block atomic="true">\r
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' ></call></block></outcome><outcome value='activate'><block>\r
-<block atomic="true">\r
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-activate' mode='sync' ></call></block></outcome><outcome value='rollback'><block>\r
-<block atomic="true">\r
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' ></call></block></outcome><outcome value='delete'><call module='VNF-API' rpc='vnf-topology-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='svc-action not recognized'/>\r
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file
+<!--
+  ============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-operation' mode='sync'>
+<block atomic="true"><record plugin="com.att.sdnctl.sli.recording.FileRecorder">
+<parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+<parameter name="field1" value="__TIMESTAMP__"/>
+<parameter name="field2" value="svc-topology-operation"/>
+<parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action`"/>
+<parameter name="field4" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/>
+<parameter name="field5" value="`$vnf-topology-operation-input.service-information.service-instance-id`"/>
+<parameter name="field6" value="`$vnf-topology-operation-input.request-information.request-id`"/>
+<parameter name="field7" value="`$vnf-topology-operation-input.request-information.request-action`"/>
+<parameter name="field8" value="`$vnf-topology-operation-input.request-information.source`"/>
+<parameter name="field9" value="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"/>
+<parameter name="field10" value="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"/>
+<parameter name="field11" value="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"/>
+<parameter name="field12" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"/>
+<parameter name="field13" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"/>
+<parameter name="field14" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/>
+<parameter name="field15" value="`$vnf-topology-operation-input.vnf-request-information.tenant`"/>
+<parameter name="field16" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"/>
+<parameter name="field17" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"/>
+<parameter name="field18" value="`$preload-data.oper-status.order-status`"/></record><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='false'>
+<return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='request.vnf-name not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='No preload data found to match vnf-name'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='vnf-name is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='false'>
+<return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='request.vnf-type not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='No preload data found to match vnf-type'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='vnf-type is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"><outcome value='0'><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.sdnc-request-header.svc-action`">
+<!--
+leaf svc-action {
+       type enumeration {
+               enum "reserve";
+               enum "assign";
+               enum "activate";  // equal to commit
+               enum "delete";    // equal to commit
+               enum "changeassign";
+               enum "changedelete";
+               enum "rollback";
+       }
+}
+-->
+
+<outcome value='assign'><block>
+<block atomic="true">
+<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-assign' mode='sync' ></call></block></outcome><outcome value='changeassign'><block>
+<block atomic="true">
+<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' ></call></block></outcome><outcome value='activate'><block>
+<block atomic="true">
+<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-activate' mode='sync' ></call></block></outcome><outcome value='rollback'><block>
+<block atomic="true">
+<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' ></call></block></outcome><outcome value='delete'><call module='VNF-API' rpc='vnf-topology-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='svc-action not recognized'/>
+</return></outcome></switch></block></method></service-logic>
index cbb1be6..244696f 100644 (file)
@@ -1,13 +1,32 @@
-<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-rollback' mode='sync'>\r
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>\r
-<return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value="`'vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`"/></return></outcome></switch><switch test="`$service-data.oper-status.order-status == PendingCreate`"><outcome value='false'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch><set>\r
-       <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>\r
-       <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>\r
-       <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>\r
-       <parameter name="service-data." value="" /> \r
-</set><return status='success'>\r
-       <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file
+<!--
+  ============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-rollback' 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 = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`"/></return></outcome></switch><switch test="`$service-data.oper-status.order-status == PendingCreate`"><outcome value='false'><return status='failure'>
+       <parameter name='error-code' value='400'/>
+       <parameter name='error-message' value='Invalid order-status'/></return></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." value="" />
+</set><return status='success'>
+       <parameter name="error-code" value="200" /></return></block></method></service-logic>