Merge "Add notification system util in GVNFM"
authormaopeng zhang <zhang.maopeng1@zte.com.cn>
Thu, 6 Sep 2018 08:39:29 +0000 (08:39 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 6 Sep 2018 08:39:29 +0000 (08:39 +0000)
1  2 
lcm/lcm/nf/const.py

diff --combined lcm/lcm/nf/const.py
@@@ -35,6 -35,35 +35,35 @@@ OAUTH2_CLIENT_CREDENTIALS = "OAUTH2_CLI
  
  LCCNNOTIFICATION = "VnfLcmOperationOccurrenceNotification"
  
+ NOTIFICATION_TYPES = [
+     "VnfLcmOperationOccurrenceNotification",
+     "VnfIdentifierCreationNotification",
+     "VnfIdentifierDeletionNotification"
+ ]
+ LCM_OPERATION_TYPES = [
+     "INSTANTIATE",
+     "SCALE",
+     "SCALE_TO_LEVEL",
+     "CHANGE_FLAVOUR",
+     "TERMINATE",
+     "HEAL",
+     "OPERATE",
+     "CHANGE_EXT_CONN",
+     "MODIFY_INFO"
+ ]
+ LCM_OPERATION_STATE_TYPES = [
+     "STARTING",
+     "PROCESSING",
+     "COMPLETED",
+     "FAILED_TEMP",
+     "FAILED",
+     "ROLLING_BACK",
+     "ROLLED_BACK"
+ ]
  inst_req_data = {
      "flavourId": "flavour_1",
      "instantiationLevelId": "instantiationLevel_1",
@@@ -489,7 -518,7 +518,7 @@@ c4_data_create_network = 
      "vlanTransparent": True,
      "networkType": "vlan",
      "segmentationId": 202,
 -    "physicalNetwork": "ctrl",
 +    "physicalNetwork": "physnet1",
      "routerExternal": False
  }
  
@@@ -533,7 -562,7 +562,7 @@@ c6_data_create_port = 
      "subnetName": "subnet1",
      "macAddress": "212.12.61.23",
      "ip": "10.43.38.11",
 -    "vnicType": "normal",
 +    "vnicType": "direct",
      "securityGroups": ""
  }
  
@@@ -663,18 -692,7 +692,18 @@@ vnfdModel = 
                          },
                      },
                  ],
 -                "vnic_type": "test",
 +                "vnic_type": "direct",
 +                "role": "root",
 +                "virtual_network_interface_requirements": [
 +                    {
 +                        "network_interface_requirements": {
 +                            "interfaceType": '{"schema-version": "0", "schema-location":"", "platform-id": "generic", "mandatory": false, "configuration-value": "SR-IOV"}'
 +                        },
 +                        "support_mandatory": False,
 +                        "name": "SRIOV_Port",
 +                        "description": "sriov"
 +                    }
 +                ]
              }
          }
      ],