# 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.
+import json
from lcm.pub.utils.jobutil import enum
inst_req_data = {
"flavourId": "flavour_1",
"instantiationLevelId": "instantiationLevel_1",
+ "vnfmId": "vnfm_1",
"extVirtualLinks": [
{
"vlInstanceId": "1",
],
"localizationLanguage": "en_US",
"additionalParams": {
+ "vimId": "vim_1",
"inputs": {
"key1": "test1",
"key2": "test2"
"status": "ACTIVE"
}
-vnfpackage_info = {
+vnfdModel = {
"volume_storages": [],
"inputs": {
"pe1_id": {
}
}
+vnfpackage_info = {
+ "imageInfo": [],
+ "csarId": "vOpenNAT",
+ "packageInfo": {
+ "csarName": "vOpenNAT.csar",
+ "vnfdModel": json.dumps(vnfdModel),
+ "vnfdProvider": "Intel",
+ "vnfdId": "openNAT_1.0",
+ "downloadUrl": "http://10.96.33.39:8806/static/catalog/vOpenNAT/vOpenNAT.csar",
+ "vnfVersion": "v1.0",
+ "vnfdVersion": "v1.0",
+ "vnfPackageId": "vOpenNAT"
+ }
+}
+
# # vnfd_rawdata
# vnfd_rawdata = {
# "rawData": {
def create_res(self):
logger.info("[NF instantiation] create resource start")
- adaptor.create_vim_res(self.vnfd_info, self.do_notify)
+ self.vnfdModel = json.loads(ignore_case_get(ignore_case_get(self.vnfd_info, "packageInfo"), "vnfdModel"))
+ logger.debug("self.vnfdModel = %s", self.vnfdModel)
+ adaptor.create_vim_res(self.vnfdModel, self.do_notify)
JobUtil.add_job_status(self.job_id, 70, '[NF instantiation] create resource finish')
logger.info("[NF instantiation] create resource finish")