Artifact Handler code fixes

Code corrections in Artifact Handler to use vnf type to store capability artifact,
process download dg reference even if it is not sent in reference file,
to not generate capability artifact if reference file is at vnfc level

Issue-ID: APPC-271
Change-Id: If7e436576f9c64c3933ea681355e710ebf82c497
Signed-off-by: Ramya Balaji <rb111y@att.com>

2 files changed, 14 insertions, 3 deletions

diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java
index 043283fb1..5ca6ec3f6 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/DBServiceTest.java
@@ -9,15 +9,15 @@
  * 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.
- * 
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
@@ -30,6 +30,7 @@ import org.junit.Test;
 import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.powermock.reflect.Whitebox;
+import static org.junit.Assert.assertEquals;
 
 public class DBServiceTest {
 
@@ -234,6 +235,7 @@ public class DBServiceTest {
         MockDBService dbService = MockDBService.initialise();
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute("test", "test");
+        ctx.setAttribute(SdcArtifactHandlerConstants.FILE_CATEGORY, "testCategory");
         boolean isUpdate = true;
         dbService.processSdcReferences(ctx, isUpdate);
     }
@@ -283,5 +285,13 @@ public class DBServiceTest {
         String db = "db";
         dbService.getArtifactID(ctx, db);
     }
+    @Test
+    public void testGetDownLoadDGReference() throws Exception {
+        MockDBService dbService = MockDBService.initialise();
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("test", "test");
+        ctx.setAttribute(SdcArtifactHandlerConstants.DEVICE_PROTOCOL, "CLI");
+        assertEquals("TestDG", dbService.getDownLoadDGReference(ctx));
+    }
 }
 
diff --git a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockSvcLogicResource.java b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockSvcLogicResource.java
index ae09e459c..1a07117ed 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockSvcLogicResource.java
+++ b/appc-inbound/appc-artifact-handler/provider/src/test/java/org/openecomp/appc/artifact/handler/dbservices/MockSvcLogicResource.java
@@ -40,6 +40,7 @@ public class MockSvcLogicResource extends SqlResource {
         ctx.setAttribute("VNF_TYPE", "testvnf");
         ctx.setAttribute("maximum", "1");
         ctx.setAttribute("COUNT(*)", "1");
+        ctx.setAttribute("download-config-dg", "TestDG");
         return status;
     }