Commit 3180833e authored by Christos Tranoris's avatar Christos Tranoris
Browse files

fix for #8

parent 7b64a3ed

src/main/java/org/etsi/osl/mano/MANOController.java

+42 −35
Original line number Diff line number Diff line
@@ -1011,18 +1011,20 @@ public class MANOController { 
		try {

			// Parse the json list of objects

			org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[] vnfd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[]) mapper.readValue(vnfds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[].class);

			

			JSONArray array = new JSONArray(vnfds_list_entity.getBody());  

			

			// For each object

			for(org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd : vnfd_array)

			{

				String jsonInString=null;

			 // For each object

            for (Object object : array) {

              



              JSONObject jobj = (JSONObject) object;				

			    org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd =

			        mapper.readValue( jobj.toString() , org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd.class );



	              String jsonInString=jobj.toString();

	                ObjectMapper mapper2 = new ObjectMapper();

				mapper2.setSerializationInclusion(Include.NON_NULL);

				try {

					jsonInString = mapper2.writerWithDefaultPrettyPrinter().writeValueAsString(vnfd);

				} catch (JsonProcessingException e) {

					// TODO Auto-generated catch block

					e.printStackTrace();

				}	

										

				// Compare db derived data with osm derived data and update the database.

				logger.debug("VNFD to JSON:"+jsonInString);
@@ -1072,7 +1074,7 @@ public class MANOController { 
					// Store the requirements in HTML

					newVxFMetadata.setDescriptorHTML(vnfreq.toHTML());

					// Store the YAML file

					newVxFMetadata.setDescriptor(vnfds_list_entity.getBody());

					newVxFMetadata.setDescriptor(  jobj.toString() );

					

					//Add VxFMetadata object to db and get the generated object

					newVxFMetadata = aMANOClient.addVxFMetadata(newVxFMetadata);
@@ -1128,18 +1130,20 @@ public class MANOController { 
		try {

			// Parse the json list of objects

			org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[] vnfd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[]) mapper.readValue(vnfds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[].class);

JSONArray array = new JSONArray(vnfds_list_entity.getBody());  

            

            // For each object

			for(org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd : vnfd_array)

			{

				String jsonInString=null;

             // For each object

            for (Object object : array) {

              



              JSONObject jobj = (JSONObject) object;                

                org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd =

                    mapper.readValue( jobj.toString() , org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd.class );



                  String jsonInString=jobj.toString();

                    ObjectMapper mapper2 = new ObjectMapper();

				mapper2.setSerializationInclusion(Include.NON_NULL);

				try {

					jsonInString = mapper2.writerWithDefaultPrettyPrinter().writeValueAsString(vnfd);

				} catch (JsonProcessingException e) {

					// TODO Auto-generated catch block

					e.printStackTrace();

				}	

                                        

										

				// Compare db derived data with osm derived data and update the database.

				logger.debug("VNFD to JSON:"+jsonInString);
@@ -1245,17 +1249,20 @@ public class MANOController { 
			// Parse the json list of objects

			org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[] vnfd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[]) mapper.readValue(vnfds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[].class);

			// For each object

			for(org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd : vnfd_array)

			{

				String jsonInString=null;

			JSONArray array = new JSONArray(vnfds_list_entity.getBody());  

            

            // For each object

             // For each object

            for (Object object : array) {

              



              JSONObject jobj = (JSONObject) object;                

                org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd =

                    mapper.readValue( jobj.toString() , org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd.class );



                  String jsonInString=jobj.toString();

                    ObjectMapper mapper2 = new ObjectMapper();

				mapper2.setSerializationInclusion(Include.NON_NULL);

				try {

					jsonInString = mapper2.writerWithDefaultPrettyPrinter().writeValueAsString(vnfd);

				} catch (JsonProcessingException e) {

					// TODO Auto-generated catch block

					e.printStackTrace();

				}	

                                        

										

				// Compare db derived data with osm derived data and update the database.

				logger.debug("VNFD to JSON:"+jsonInString);