summaryrefslogtreecommitdiffstats
path: root/sdnr
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2023-11-01 19:19:18 +0000
committerGerrit Code Review <gerrit@onap.org>2023-11-01 19:19:18 +0000
commit49d117d2eb429796079146b7c9016ea63641127b (patch)
tree4ccf476ca6761a2a649ad3c9a14d3693fe1be2e3 /sdnr
parent36877e03ab4224988f2a5f8a11b0b73a54131785 (diff)
parent489b2547130ae7e56dac6780e82ff6cdc54e6abe (diff)
Merge "ConfigurationApp: OAI wrong generation of rest request"
Diffstat (limited to 'sdnr')
-rw-r--r--sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx1
-rw-r--r--sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts28
2 files changed, 15 insertions, 14 deletions
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx b/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
index 0f143d818..d7f59d61c 100644
--- a/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
+++ b/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
@@ -919,6 +919,7 @@ class ConfigurationApplicationComponent extends React.Component<ConfigurationApp
}
render() {
+ console.log('ConfigurationApplication.render()', this.props);
return this.props.collectingData || !this.state.viewData
? this.renderCollectingData()
: this.props.listSpecification
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts b/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts
index 2dbbae274..85eeb41a4 100644
--- a/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts
+++ b/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts
@@ -492,20 +492,6 @@ export class YangParser {
public postProcess() {
- // execute all post processes like resolving in proper order
- this._unionsToResolve.forEach(cb => {
- try { cb(); } catch (error) {
- console.warn(error.message);
- }
- });
-
- // process all groupings
- this._groupingsToResolve.filter(vs => vs.uses && vs.uses[ResolveFunction]).forEach(vs => {
- try { vs.uses![ResolveFunction] !== undefined && vs.uses![ResolveFunction]!('|'); } catch (error) {
- console.warn(`Error resolving: [${vs.name}] [${error.message}]`);
- }
- });
-
/**
* This is to fix the issue for sequential execution of modules based on their child and parent relationship
* We are sorting the module object based on their augment status
@@ -622,6 +608,20 @@ export class YangParser {
}
});
+ // execute all post processes like resolving in proper order
+ this._unionsToResolve.forEach(cb => {
+ try { cb(); } catch (error) {
+ console.warn(error.message);
+ }
+ });
+
+ // process all groupings
+ this._groupingsToResolve.filter(vs => vs.uses && vs.uses[ResolveFunction]).forEach(vs => {
+ try { vs.uses![ResolveFunction] !== undefined && vs.uses![ResolveFunction]!('|'); } catch (error) {
+ console.warn(`Error resolving: [${vs.name}] [${error.message}]`);
+ }
+ });
+
// resolve readOnly
const resolveReadOnly = (view: ViewSpecification, parentConfig: boolean) => {