/*-
* ============LICENSE_START======================================================================
- * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 Nordix Foundation. 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.
import com.oransc.rappmanager.configuration.RappManagerConfiguration;
import com.oransc.rappmanager.models.cache.RappCacheService;
import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import com.oransc.rappmanager.models.csar.validator.RappValidationHandler;
import com.oransc.rappmanager.models.exception.RappHandlerException;
import com.oransc.rappmanager.models.rapp.PrimeOrder;
import com.oransc.rappmanager.models.rapp.Rapp;
Logger logger = LoggerFactory.getLogger(RappController.class);
private final RappCsarConfigurationHandler rappCsarConfigurationHandler;
+ private final RappValidationHandler rappValidationHandler;
private final RappManagerConfiguration rappManagerConfiguration;
private final RappCacheService rappCacheService;
private final RappService rappService;
@PostMapping("{rapp_id}")
public ResponseEntity<Rapp> createRapp(@PathVariable("rapp_id") String rappId,
@RequestPart("file") MultipartFile csarFilePart) throws IOException {
- if (rappCsarConfigurationHandler.isValidRappPackage(csarFilePart)) {
+ if (rappValidationHandler.isValidRappPackage(csarFilePart)) {
File csarFile = new File(
rappCsarConfigurationHandler.getRappPackageLocation(rappManagerConfiguration.getCsarLocation(),
rappId, csarFilePart.getOriginalFilename()).toUri());
Rapp rapp = Rapp.builder().name(rappId).packageLocation(rappManagerConfiguration.getCsarLocation())
.packageName(csarFile.getName()).state(RappState.COMMISSIONED).build();
rapp.setRappResources(rappCsarConfigurationHandler.getRappResource(rapp));
+ rapp.setAsdMetadata(rappCsarConfigurationHandler.getAsdMetadata(rapp));
rappCacheService.putRapp(rapp);
return ResponseEntity.accepted().build();
} else {