Commit ae4b2817 authored by Eduardo Santos's avatar Eduardo Santos
Browse files

Changed Primitives characteristic name to PrimitivesList

parent e513b7f1

src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java

+1 −1
Original line number Diff line number Diff line
@@ -1227,7 +1227,7 @@ public class ServiceSpecificationRepoService { 
    

            JSONObject allPrimitives = PrimitivesParser.extractVNFPrimitives(vnfdJson, vduPrimitives);

    

            addServiceSpecCharacteristic(serviceSpec, "Primitives", "NSPrimitives", new Any(allPrimitives.toString(), ""), EValueType.TEXT);

            addServiceSpecCharacteristic(serviceSpec, "PrimitivesList", "NSPrimitives", new Any(allPrimitives.toString(), ""), EValueType.TEXT);



            /********************* End Primitives Handling *********************/

src/test/java/org/etsi/osl/services/reposervices/ServiceSpecificationRepoServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * @Author: Eduardo Santos

 * @Date:   2024-04-15 15:30:11

 * @Last Modified by:   Eduardo Santos

 * @Last Modified time: 2024-04-26 09:19:01

 * @Last Modified time: 2024-05-14 17:43:06

 */

package org.etsi.osl.services.reposervices;
@@ -427,7 +427,7 @@ public class ServiceSpecificationRepoServiceTest { 
        value = v.getValue();

        alias = v.getAlias();



        assertEquals("Primitives", serviceSpecCharacteristic.getName());

        assertEquals("PrimitivesList", serviceSpecCharacteristic.getName());

        assertEquals("{\"vnfs\":[{\"config-primitive\":[{\"parameter\":[{\"name\":\"filename\",\"data-type\":\"STRING\"}],\"name\":\"run-touch-command\"}],\"id\":\"vnf1\",\"vdu-configs\":[{\"config-primitive\":[{\"parameter\":[{\"name\":\"filename\",\"data-type\":\"STRING\"}],\"name\":\"run-touch-command\"}],\"id\":\"vdu1\"},{\"config-primitive\":[{\"parameter\":[{\"name\":\"filename\",\"data-type\":\"STRING\"}],\"name\":\"run-touch-command\"}],\"id\":\"vdu2\"}]},{\"config-primitive\":[{\"parameter\":[{\"name\":\"filename\",\"data-type\":\"STRING\"}],\"name\":\"run-touch-command\"}],\"id\":\"vnf2\",\"vdu-configs\":[{\"config-primitive\":[{\"parameter\":[{\"name\":\"filename\",\"data-type\":\"STRING\"}],\"name\":\"run-touch-command\"}],\"id\":\"vdu1\"},{\"config-primitive\":[{\"parameter\":[{\"name\":\"filename\",\"data-type\":\"STRING\"}],\"name\":\"run-touch-command\"}],\"id\":\"vdu2\"}]}]}", value);

        assertEquals("", alias);