# 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
import logging
-import traceback
import time
+import traceback
import uuid
from rest_framework import status
+from lcm.pub.config.config import WORKFLOW_OPTION
from lcm.pub.database.models import DefPkgMappingModel, ServiceBaseInfoModel, InputParamMappingModel
-from lcm.pub.database.models import NSInstModel, NfPackageModel, VNFFGInstModel, WFPlanModel
+from lcm.pub.database.models import NSInstModel, VNFFGInstModel, WFPlanModel
+from lcm.pub.exceptions import NSLCMException
+from lcm.pub.msapi import activiti
+from lcm.pub.msapi import sdc_run_catalog
from lcm.pub.msapi.catalog import get_process_id, query_rawdata_from_catalog
from lcm.pub.msapi.catalog import get_servicetemplate_id, get_servicetemplate
-from lcm.pub.msapi.wso2bpel import workflow_run
from lcm.pub.msapi.extsys import select_vnfm
-from lcm.pub.utils.jobutil import JobUtil
+from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id
+from lcm.pub.msapi.wso2bpel import workflow_run
from lcm.pub.utils import toscautil
+from lcm.pub.utils.jobutil import JobUtil
from lcm.pub.utils.values import ignore_case_get
-from lcm.pub.exceptions import NSLCMException
-from lcm.pub.config.config import WORKFLOW_OPTION
from lcm.workflows import build_in
-from lcm.pub.msapi import activiti
-from lcm.pub.msapi import sdc_run_catalog
logger = logging.getLogger(__name__)
plan_dict = json.JSONDecoder().decode(dst_plan)
for vnf in ignore_case_get(plan_dict, "vnfs"):
vnfd_id = vnf['properties']['id']
- vnfd = NfPackageModel.objects.get(vnfdid=vnfd_id)
- vnfd_model = json.JSONDecoder().decode(vnfd.vnfdmodel)
+ # vnfd = NfPackageModel.objects.get(vnfdid=vnfd_id)
+ vnfpackage_info = query_vnfpackage_by_id(vnfd_id)
+ vnfd_model = json.JSONDecoder().decode(ignore_case_get(vnfpackage_info["packageInfo"], "vnfdModel"))
vnfm_type = vnfd_model["metadata"].get("vnfmType", "ztevmanagerdriver")
vimid = self.get_vnf_vim_id(vim_id, location_constraints, vnfd_id)
vnfm_info = select_vnfm(vnfm_type=vnfm_type, vim_id=vimid)
}
})
# end
-
+
self.set_vl_vim_id(vim_id, location_constraints, plan_dict)
dst_plan = json.JSONEncoder().encode(plan_dict)
logger.debug('tosca plan dest add vimid:%s' % dst_plan)
NSInstModel.objects.filter(id=self.ns_inst_id).update(nsd_model=dst_plan)
-
+
vnf_params_json = json.JSONEncoder().encode(params_vnf)
- plan_input = {'jobId': job_id,
+ plan_input = {
+ 'jobId': job_id,
'nsInstanceId': self.req_data["nsInstanceId"],
'object_context': dst_plan,
'object_additionalParamForNs': params_json,
- 'object_additionalParamForVnf': vnf_params_json}
+ 'object_additionalParamForVnf': vnf_params_json
+ }
plan_input.update(**self.get_model_count(dst_plan))
plan_input["sdnControllerId"] = ignore_case_get(
self.req_data['additionalParamForNs'], "sdncontroller")
pass
for key, val in self.req_data['additionalParamForNs'].items():
- InputParamMappingModel(service_id=self.ns_inst_id,
- input_key=key, input_value=val).save()
+ InputParamMappingModel(service_id=self.ns_inst_id, input_key=key, input_value=val).save()
for vnffg in ignore_case_get(plan_dict, "vnffgs"):
VNFFGInstModel(vnffgdid=vnffg["vnffg_id"],
- vnffginstid=str(uuid.uuid4()),
- nsinstid=self.ns_inst_id,
- endpointnumber=0).save()
+ vnffginstid=str(uuid.uuid4()),
+ nsinstid=self.ns_inst_id,
+ endpointnumber=0).save()
if WORKFLOW_OPTION == "wso2":
return self.start_wso2_workflow(job_id, ns_inst, plan_input)
logger.error("ns-instant(%s) workflow error:%s" % (self.ns_inst_id, e.message))
JobUtil.add_job_status(job_id, 255, 'NS instantiation failed: %s' % e.message)
return dict(data={'error': e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
+
def start_wso2_workflow(self, job_id, ns_inst, plan_input):
servicetemplate_id = get_servicetemplate_id(ns_inst.nsd_id)
process_id = get_process_id('init', servicetemplate_id)
if not plans:
raise NSLCMException("No plan is found, you should deploy plan first!")
data = {
- "processId": plans[0].process_id,
- "params": plan_input
+ "processId": plans[0].process_id,
+ "params": plan_input
}
ret = activiti.exec_workflow(data)
logger.info("ns-instant(%s) workflow result:%s" % (self.ns_inst_id, ret))
self.ns_inst_id, ret.get('status')))
if ret.get('status') == 1:
return dict(data={'jobId': job_id}, status=status.HTTP_200_OK)
- return dict(data={'error': ret['message']}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+ return dict(data={'error': ret['message']}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
def start_buildin_workflow(self, job_id, plan_input):
- JobUtil.add_job_status(job_id, 10, 'NS inst(%s) buildin workflow started.' %
- self.ns_inst_id)
+ JobUtil.add_job_status(job_id, 10, 'NS inst(%s) buildin workflow started.' % self.ns_inst_id)
build_in.run_ns_instantiate(plan_input)
return dict(data={'jobId': job_id}, status=status.HTTP_200_OK)
if vim_id:
return vim_id
raise NSLCMException("No Vim info is found for vnf(%s)." % vnfdid)
-
+
def set_vl_vim_id(self, vim_id, location_constraints, plan_dict):
if "vls" not in plan_dict:
logger.debug("No vl is found in nsd.")
if "location_info" not in vl["properties"]:
vl["properties"]["location_info"] = {}
vl["properties"]["location_info"]["vimid"] = vimid
-
+
@staticmethod
def get_model_count(context):
data = json.JSONDecoder().decode(context)
Code Review / vfc / nfvo / lcm.git / blobdiff