Commit 958788d7 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

fix for #11 - NPE when vnfprofile map is null

parent 48d203ba

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk 
MAINTAINER openslice.io

RUN mkdir /opt/shareclasses

RUN mkdir -p /opt/openslice/lib/

COPY target/org.etsi.osl.manoclient-1.0.4-SNAPSHOT.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.manoclient-1.0.4-SNAPSHOT.jar"]
 
 No newline at end of file
 
COPY target/org.etsi.osl.manoclient-1.1.0-SNAPSHOT.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.manoclient-1.1.0-SNAPSHOT.jar"]
 
 No newline at end of file

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

+62 −45
Original line number Diff line number Diff line
@@ -1462,9 +1462,10 @@ JSONArray array = new JSONArray(vnfds_list_entity.getBody()); 
					// Store the YAML file

					newExperimentMetadata.setDescriptor( jobj.toString() );

					

					if (nsd.getDf() != null) {

						for (Df v : nsd.getDf().values()) {

						for( VnfProfile q : v.getVnfProfile().values())

						{

							if (v != null && v.getVnfProfile() != null) {

								for (VnfProfile q : v.getVnfProfile().values()) {

									ConstituentVxF cvxf = new ConstituentVxF();

									try {

										cvxf.setMembervnfIndex(q.getId());
@@ -1473,12 +1474,16 @@ JSONArray array = new JSONArray(vnfds_list_entity.getBody()); 
										cvxf.setMembervnfIndex("0");

									}

									cvxf.setVnfdidRef((String) q.getVnfdId());

							String vxfuuid = aMANOClient.getVxFOnBoardedDescriptorByVxFAndMP(q.getVnfdId(), mp.getId());

									String vxfuuid = aMANOClient.getVxFOnBoardedDescriptorByVxFAndMP(q.getVnfdId(),

											mp.getId());

									VxFMetadata vxf = (VxFMetadata) aMANOClient.getVxFByUUid(vxfuuid);

									cvxf.setVxfref(vxf);

									((ExperimentMetadata) newExperimentMetadata).getConstituentVxF().add(cvxf);

								}

							}

						}

					}



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

					newExperimentMetadata = aMANOClient.addExperimentMetadata(newExperimentMetadata);

					logger.info("Experiment " + nsd.getId() + " added with ExperimentMetadata id="+newExperimentMetadata.getId());
@@ -1595,7 +1600,9 @@ JSONArray array = new JSONArray(vnfds_list_entity.getBody()); 
					// Store the YAML file

                    newExperimentMetadata.setDescriptor( jobj.toString() );

					

					if (nsd.getDf() != null) {

						for (Df v : nsd.getDf().values()) {

							if (v != null && v.getVnfProfile() != null) {

								for( VnfProfile q : v.getVnfProfile().values())

								{

									ConstituentVxF cvxf = new ConstituentVxF();
@@ -1612,6 +1619,9 @@ JSONArray array = new JSONArray(vnfds_list_entity.getBody()); 
									((ExperimentMetadata) newExperimentMetadata).getConstituentVxF().add(cvxf);					

								}

							}

						}

					}

										

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

					newExperimentMetadata = aMANOClient.addExperimentMetadata(newExperimentMetadata);

					logger.info("Experiment " + nsd.getId() + " added with ExperimentMetadata id="+newExperimentMetadata.getId());
@@ -1730,9 +1740,12 @@ JSONArray array = new JSONArray(vnfds_list_entity.getBody()); 
					// Store the YAML file

                    newExperimentMetadata.setDescriptor( jobj.toString() );			

					

					

					if (nsd.getDf() != null) {

						for (Df v : nsd.getDf().values()) {

						for( VnfProfile q : v.getVnfProfile().values())

						{

							if (v != null && v.getVnfProfile() != null) {



								for (VnfProfile q : v.getVnfProfile().values()) {

									ConstituentVxF cvxf = new ConstituentVxF();

									try {

										cvxf.setMembervnfIndex(q.getId());
@@ -1741,12 +1754,16 @@ JSONArray array = new JSONArray(vnfds_list_entity.getBody()); 
										cvxf.setMembervnfIndex("0");

									}

									cvxf.setVnfdidRef((String) q.getVnfdId());

							String vxfuuid = aMANOClient.getVxFOnBoardedDescriptorByVxFAndMP(q.getVnfdId(), mp.getId());

									String vxfuuid = aMANOClient.getVxFOnBoardedDescriptorByVxFAndMP(q.getVnfdId(),

											mp.getId());

									VxFMetadata vxf = (VxFMetadata) aMANOClient.getVxFByUUid(vxfuuid);

									cvxf.setVxfref(vxf);

									((ExperimentMetadata) newExperimentMetadata).getConstituentVxF().add(cvxf);

								}

							}

						}

					}	

								

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

					newExperimentMetadata = aMANOClient.addExperimentMetadata(newExperimentMetadata);

					logger.info("Experiment " + nsd.getId() + " added with ExperimentMetadata id="+newExperimentMetadata.getId());