The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [2.2.2]
+### Changed
+* Bug fix for Create MG (DCAEGEN2-3118)
+
## [2.2.1]
### Changed
* Swagger Indentation Error (DCAEGEN2-3103)
logger.info(f'Initiating create measurement group for: {measurement_group_name}')
check_duplication(subscription.subscription_name, measurement_group_name)
check_measurement_group_names_comply(measurement_group_name, body)
- new_mg = [save_measurement_group(body, subscription.subscription_name)]
- if body["administrativeState"] == AdministrativeState.UNLOCKED.value:
+ new_mg = [save_measurement_group(body["measurementGroup"], subscription.subscription_name)]
+ if body["measurementGroup"]["administrativeState"] == AdministrativeState.UNLOCKED.value:
filtered_nfs = nf_service.capture_filtered_nfs(subscription.subscription_name)
subscription_service.add_new_filtered_nfs(filtered_nfs, new_mg, subscription)
else:
logger.info(f'Measurement Group {measurement_group_name} is not in an unlocked state')
+ db.session.commit()
def check_measurement_group_names_comply(measurement_group_name, measurement_group):
measurement_group (dict): Measurement Group
"""
- if measurement_group_name != measurement_group["measurementGroupName"]:
+ logger.info("Checking names match")
+ if measurement_group_name != measurement_group["measurementGroup"]["measurementGroupName"]:
logger.info(f'Changing measurement_group_name in body to {measurement_group_name}')
- measurement_group["measurementGroupName"] = measurement_group_name
+ measurement_group["measurementGroup"]["measurementGroupName"] = measurement_group_name
def check_duplication(subscription_name, measurement_group_name):
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>pmsh</artifactId>
<name>dcaegen2-services-pm-subscription-handler</name>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.2-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.sources>.</sonar.sources>
setup(
name="pm_subscription_handler",
- version="2.2.1",
+ version="2.2.2",
packages=find_packages(),
author="lego@est.tech",
author_email="lego@est.tech",
self.assertEqual(e.args[0], 'Measurement Group Name: MG1 already exists.')
def test_check_measurement_group_names_comply(self):
- mg = {'subscription_name': 'sub',
+ mg = {'measurementGroup': {
'measurementGroupName': 'MG2',
'administrativeState': 'UNLOCKED',
'fileBasedGP': 15,
'fileLocation': '/pm/pm.xml',
'measurementTypes': '[{ "measurementType": "countera" }, '
'{ "measurementType": "counterb" }]',
- 'managedObjectDNsBasic': '[{ "DN":"dna"},{"DN":"dnb"}]'}
+ 'managedObjectDNsBasic': '[{ "DN":"dna"},{"DN":"dnb"}]'}}
try:
measurement_group_service.check_measurement_group_names_comply('MG1', mg)
except InvalidDataException as e:
mock_aai.return_value = json.loads(self.aai_response_data)
mock_model_aai.return_value = json.loads(self.good_model_info)
subscription_data = create_subscription_data('Post_MG')
- measurement_grp = {'subscription_name': 'sub',
+ measurement_grp = {'measurementGroup': {
'measurementGroupName': 'MG2',
'administrativeState': 'UNLOCKED',
'fileBasedGP': 15,
'fileLocation': '/pm/pm.xml',
'measurementTypes': '[{ "measurementType": "countera" }, '
- '{ "measurementType": "counterb" }]',
- 'managedObjectDNsBasic': '[{ "DN":"dna"},{"DN":"dnb"}]'}
+ '{ "measurementType": "counterb" }]',
+ 'managedObjectDNsBasic': '[{ "DN":"dna"},{"DN":"dnb"}]'}}
db.session.add(subscription_data)
db.session.commit()
db.session.remove()
major=2
minor=2
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT