diff options
| author |   Michael Hwang <mhwang@research.att.com> | 2017-09-14 13:06:21 -0400 |
|---|---|---|
| committer | Michael Hwang <mhwang@research.att.com> | 2017-09-14 14:50:51 -0400 |
| commit | 0d4c19a9389a933cf5b5e83173f97f8cd72b7f5e (patch) | |
| tree | c160ab6cdaf600f8025d75e91898d133ebc000f8 /dcae-cli/dcae_cli/util/dmaap.py | |
| parent | 3b22c6518e8dbb4a4ddf7aa615a8dccdc2d280b7 (diff) | |
Merge in changes there were made since seeding
* Fix DR config keys issue
* Add data format generate command
* Improve error messaging
* Add in support for inputs otherwise known as "sourced at deployment"
Change-Id: I9d97c30aeba587315d7fd1a18c38f71d8199d42b
Issue-Id: DCAEGEN2-91
Signed-off-by: Michael Hwang <mhwang@research.att.com>
Diffstat (limited to 'dcae-cli/dcae_cli/util/dmaap.py')
| -rw-r--r-- | dcae-cli/dcae_cli/util/dmaap.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dcae-cli/dcae_cli/util/dmaap.py b/dcae-cli/dcae_cli/util/dmaap.py index 0c89d6d..138e909 100644 --- a/dcae-cli/dcae_cli/util/dmaap.py +++ b/dcae-cli/dcae_cli/util/dmaap.py @@ -287,9 +287,10 @@ def validate_dmaap_map_entries(dmaap_map, mr_config_keys, dr_config_keys): logger.error("Please use the \"--dmaap-file\" option") return False + config_keys = dr_config_keys + mr_config_keys # Look for missing keys is_missing = lambda config_key: config_key not in dmaap_map - missing_keys = list(filter(is_missing, mr_config_keys)) + missing_keys = list(filter(is_missing, config_keys)) if missing_keys: logger.error("Missing config keys in dmaap json: {0}".format( @@ -298,7 +299,7 @@ def validate_dmaap_map_entries(dmaap_map, mr_config_keys, dr_config_keys): return False # Look for unexpected keys - is_unexpected = lambda config_key: config_key not in mr_config_keys + is_unexpected = lambda config_key: config_key not in config_keys unexpected_keys = list(filter(is_unexpected, dmaap_map.keys())) if unexpected_keys: |