Drop Nokia from file header copyright line

This is preparation for moving the entire code base to a new
repository and without any history, due to concerns raised by
the Nokia legal department about their name appearing here in
a repository where they have made no contributions.

Change-Id: Ic1931f5d8e5aa2693a29d7b119e3a0b40e6f12c7
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Show K8S pod statuses queried from CaaS-Ingress

Bump POM versions to 1.2.4.
Extend properties with Caas-Ingress URLs for ricaux, ricplt.
Add description of properties to config-deploy doc.
Add mock Caas-Ingress data with sanitized host and IP.
Add back-end Caas-Ingress controller and configuration.
Add back-end test configuration and test cases.
Add front-end caas-ingress component, service, data source.
Add front-end platform component with two caas-ingress components.
Upgrade Angular core and other front-end TS libraries.

Change-Id: Iac216fb1fa0e7d36aa1e993ab774f427b9b6dfca
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add a1, appmgr submodules to provide API specs

Revise POM files to use the new path for the spec files.
Removed cached copies of the A1 mediator and Application
Manager API specification YAML files.
No functional change - submodules are pinned at commits
with the same spec file content as before.

Change-Id: I8b72306c83953c90bd03df4903bef0e4937aa9d6
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add an anchor so we can reference this doc via

inter-sphinx mapping from the doc project

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: I349ba8e82aeb063d913b7e608641e9c6793002ec

Configure for publishing RST to readthedocs.io

Change-Id: I66bca6ca33058c3120c6999296feb90553fbb0f1
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Serve login page without using redirect

This preserves original scheme, either HTTP or HTTPS.
Correct URL of Dashboard REST URL in config-deploy doc.
Bump version to 1.2.3.

Change-Id: Ia7da1e2a7a0f189c95072ddda51ac59a738d9247
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Improve doc for Portal API configuration

Refactor some classes but no functional changes,
so did not bump the version number.

Change-Id: I42dcba55ba980f94a956c0d3990f2f6d4a9cce11
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add configuration option for Portal security

Create version 1.2.2

Change-Id: Ia3ab2a26f64473c035c20db858140f30d79c09d5
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Install curl when building docker image

Change-Id: I8eccb1e2ed82c2f0f9d7828597c091da37f9eb98
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Extend RAN connection table to handle null fields

Change-Id: Ice9fb02e012b550bd799f8ff51dd1368c7339140
Signed-off-by: Manoop Talasila <talasila@research.att.com>

Revise E2 form validation patterns

Allow any nonempty alphanumeric RAN name
Block whitespace in IP address

Change-Id: I8a82153eed48b2f4a8041dd342f075aae6b74e5c
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Extend ANR mock config to persist edit and delete

Change-Id: Ided9b7aae94457b50ecc04b4322ee565212d8d3f
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Match front end E2mgr URL paths to back end

Extend front end to trim whitespace on form inputs.
Bump version to 1.2.1.

Change-Id: I8cb10264148ab51fb123b420bc9c2ad350e093be
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

MC App metrics display

Signed-off-by: Sarkar, Anand (as0481) <as0481@att.com>
Issue-Id: RICPLT-1628
Change-Id: Ib66e001164a109e469e3276efd7b05d6ffeeb8da

Merge "Upgrade E2Mgr spec to version 2.0.5 of 2019-09-11"

Upgrade E2Mgr spec to version 2.0.5 of 2019-09-11

Minor changes in the backend but no behavior changes.

Change-Id: Ica61cc488d077dc1001828229a3d858bbeea31ae
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add master_doc value index to conf.py

Not sure why but read the docs is throwing an error:

Running Sphinx v1.8.5
loading translations [en]... done
making output directory...
building [mo]: targets for 0 po files that are out of date
building [readthedocs]: targets for 5 source files that are out of date
updating environment: 5 added, 0 changed, 0 removed
reading sources... [ 20%] config-deploy
reading sources... [ 40%] developer-guide
reading sources... [ 60%] index
reading sources... [ 80%] overview
reading sources... [100%] release-notes

Sphinx error:
master file
/home/docs/checkouts/readthedocs.org/user_builds\
/o-ran-sc-portal-ric-dashboard-test/checkouts/master/docs/contents.rst
not found

I think this will fix it..
(just a quick google didnt look too hard)

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: If56b5da595b47461111a03ef88e7178b85dc1f00

Stuff needed for read the docs builds

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: I7e0aba09f1a88da0ba67615f31871634b045eb21

Add python/tox config for documentation

Change-Id: I755b1fbce971d0df5fb4d4508ae3beb5f6a286b2
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add loading component

Create loading-dialog component and service
Showing the loading-dialog while making API call
Add notification and error handling for xapp configuration

Change-Id: I6366c07d63055057fdc45036b56a2fcbfff04487
Signed-off-by: Jun (Nicolas) Hu <jh245g@att.com>

Use new get method from A1 API for AC policy

Upgrade A1 API spec to version 0.10.3 which defines object
  (not void) return value on the get-policy method.
Extend AC FE screen to read policy using get method.
Change controller name from AC to A1.
Ensure numeric values go as numbers, not strings.

Change-Id: I2cede67d499cb2d6a835d9a2938fedcafbe6eed4
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Updated RST documentation

Updated content to developer's guide about app on-boarding to ONAP Portal.

Signed-off-by: Manoop Talasila <talasila@research.att.com>
Change-Id: If5533afbd6bd893a11d08c77156dd0a62cbe8bec

Merge "Change typescript variables to snake_case"

Change typescript variables to snake_case

The AC data schema specifies keys like blocking_rate,
but the form was sending keys like blockingRate

Change-Id: I4ab923be48b67f69319b5bec44bc6c1c7b2e9feb
Issue-Id:  RICPLT-1994
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Merge "Pass AC policy content to A1 without parsing"

Pass AC policy content to A1 without parsing

Change-Id: I8213c4c387337c94a8c703f297bc003b4a01ebfc
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Modify FE method to accept response code 204

Change-Id: Ie93005d683df15a3c345c541de93533accd2ccb5
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Show AC app data visualization in new metrics tab

Signed-off-by: Sarkar, Anand (as0481) <as0481@att.com>
Issue-Id: RICPLT-958
Change-Id: Ib06da274321bcb8fd28918314ca275f6b4c6a048
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Repair app manager controller undeploy method

Was using the wrong object and taking NPE

Change-Id: I447aaa60f5e28b02128d519d1ba10ed842f99363
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Disable the x-frame-options response header

Spring Security blocks framing by default.

Change-Id: I51a1fa31599a55196675fe505f6c47696af40b6d
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

RIC dynamic config screen for each xApp

create an app-configuration component

Change-Id: I62dbeaf20508296b99248d3f0d8c2af11111f7ac
Signed-off-by: Jun (Nicolas) Hu <jh245g@att.com>

Synch up paths front-end vs back-end for A1/AC

Also extend the error controller to log more details.

Issue-Id: RICPLT-1994
Change-Id: I2bc5462e4bddac632f8eeedd9dd60fe7ee8d2b09
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Synch front-end and back-end method paths for AC

Get/Put use the same method name.  The front-end was
calling method "catime", which never existed.

Change-Id: I72ee2fe14c2f91dffaead7cc7bd7b96fbd4b8db0
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Merge "Revise controller error handling"

Merge "Upgrade E2Mgr spec to version 2019-08-15"

Revise controller error handling

Change-Id: Icb4a546172c86e82ae35e8f97b72857cce62077b
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add pattern to match AC application name

Trigger on "admin" in addition to "admission".

Change-Id: I1f432e9cb9b92e80d213610f1a8d01112f016249
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Upgrade E2Mgr spec to version 2019-08-15

No functional changes in the Dashboard code.

Change-Id: Iab4ee773456f750603b55e04655136dfb1c18e38
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Extend Mock E2Mgr configuration to save state

This supports demonstrations without a live E2Manager

Change-Id: I3b9d611509c50709bd5415d3b4902bd9096c84b6
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add RST documentation

Add overview of supported components and applications.
Move README.md content to developer's guide.

Change-Id: I8bcd519c041a73a645007ac289d771e92be29c43
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Allow browser refresh on known Angular routes

Stop the frustrating "404 page not found" behavior
Also add documentation of configuration parameters.

Change-Id: I189f1c8b579da6c5ddce4838760f947c5959cb69
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Upgrade E2 manager spec to version 2019-08-13

This changes the drop-all-connections endpoint path
from "nodebPut" to "nodebShutdownPut".

Change-Id: I3f4fcb727c20f62bf0d7521ffe3d3d2eafdb3bb2
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Upgrade E2 manager spec to version 2019-08-08

This changes the drop-all-connections endpoint to use
method PUT (formerly used method DELETE).
Adds back-end controller method to handle RESET, but
the front end does not yet expose a control for this.

Change-Id: Iade4ce48291844893bfb832c144cf75a2e0d3595
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Postpone authentication to version 1.2.1

Change-Id: I9a86348dca7dd79c2080019156b568f103f11dbe
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Merge "Open all swagger-requested endpoints"

Upgrade App Manager API spec to v0.1.7

Change-Id: I74204d5636948430a8ea0dfac8c29cae5dc81f2d
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Open all swagger-requested endpoints

Avoid the basic HTTP auth sign-in challenge when testing locally

Change-Id: I1f009f896cb387178d1dd5c43d621d3a2eaeb1eb
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Update A1 mediator API to version 0.10.0

Change-Id: If9c4bbc932653397f225e55d6f7ec65f16f16e62
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Integrate EPSDK-FW library for auth and users

Change-Id: I8cba9e80e50b0e890783610d769e275091f942a7
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Move mock configurations to test area

Add new DashboardTestServer class to support development.
Demote mockito dependencies to test scope.

Change-Id: I9dab0f9af61cad901892620d769e275091f953b8
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add configurable delay to mock endpoints

Extend all mocked methods with a configurable call
to Thread.sleep() to simulate the delays seen when
testing real implementations.
Clean up some minor front-end type definitions.

Change-Id: Ibd224696649641df27e82888181d89149f47c385
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Drop e2.mock.rannames feature

This mocked a list of RAN names to support testing in R1.
Remove because the latest e2mgr provides a list of names.

Change-Id: I467c9ec33b53ea524ace97eab4c87c4f0bbbf6b9
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Drop unused POJO model classes.

The model classes supported early pendulum demos.
Correct imports in AcXappControllerTest class.

Change-Id: Id2bb5efc023cfe3ad233aca1ff89b0032373d24b
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Non-functional changes to silence Sonar

Change-Id: Ifaaa03b0fda05004d27c3045f5c523282dcba238
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add sonar plugin config to parent POM file

Upgrade to Java 11 compiler and openjdk:11 base image.
Upgrade version of jacoco plugin.
Drop forkCount=0 config on surefire plugin.

Change-Id: I2355f950c1689cfda01a0f21783cb0a0025de1f9
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Split URL properties into prefix/suffix

Bump version to 1.2.0.
Upgrade to Junit5.
Address some minor Sonar complaints.
Support Java 9 and later.

Change-Id: I3205e4c294f0826d363e591ce9881a4f25e0cfa2
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add JUnit tests of backend controllers

Change-Id: I98be18b47d5b14154d4bed018f51f86b89b9ce15
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add error handling to improve user experience

Add front-end error handlers to indicate when data
could not be fetched, which explains an empty table.
Revise back-end error handling to reduce lines of code;
add a central ControllerAdvice class that catches any
HttpStatusCodeException and generates a JSON response.

Change-Id: I434e602a89d05ed4de13cddc31633970aa2c8e5d
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Merge "Revise the notification service"

Revise the notification service

Use ngx-toastr (drop matSnackBar) to gain support
for displaying multiple notifications at once.

Change-Id: I57fe084a6d0380eebd14a30d58404afb45e168f4
Signed-off-by: Jun (Nicolas) Hu <jh245g@att.com>
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Upgrade E2 Manager API to 2019-07-03

Adds data to a response object, no new APIs

Change-Id: Icc1a831d8eb8e59994c53fa3bc4620708c7ed1df
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Rename component selectors to use prefix "rd"

Dropped use of the generated "app" prefix

Change-Id: I072fc4348b29007b2f52078ab0d685ad0f29396d
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Upgrade E2 manager to spec dated 2019-06-30

This renames the get-nodeb-ids endpoint path slightly.

Change-Id: I8156d325bf023d5ed1beb0c9fdfda09d25b1e9e7
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Upgrade E2 to version 20190626

E2 added a method to get the RAN identities, which answers
a list of names that can be used to query the RAN status
endpoint.  Extend FE and BE to use the new information.
Drop the mock behavior for tracking connection requests;
add a mock behavior for RAN names to support R1 testing.

Change-Id: I669f1e0537676c8b2ea09e5b53080396d91d9868
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Fix AC xPP page title alignment

Signed-off-by: Sarkar, Anand (as0481) <as0481@att.com>
Issue-Id: RICPLT-1576
Change-Id: I545ee850df9f56e2e908f73856c1e1c2e83f141e

Minor UI changes - tooltips, spelling

Add tooltips to action icons on control and admin screens
  to be consistent with the catalog screen.
Change Flag No Transaction to Flag No Xn in dialog
  to be consistent with the table header.

Change-Id: I14b2949708dfb6d33bf8cf9b878494ddf9d90648
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Merge "Upgrade Angular and Spring-Boot"

Merge "Revise the notification services"

Revise the notification services

Increase the success notification duration from 3s to 10s.
Remove automatically dismissing the warning and error notifications
Add the dismiss action into warning and error notifications

Change-Id: Iabedc3143b77a8432ad62257e3fc0af2efec23e2
Signed-off-by: Jun (Nicolas) Hu <jh245g@att.com>

Upgrade Angular and Spring-Boot

Bump dashboard parent POM version to 1.0.5.
BE:
  Upgrade to Spring-Boot v2.1.6.RELEASE.
FE:
  upgrade to Angular v8
  update node modules
  add mandatory second argument to ViewChild invocation
  remove all imports of ng2-smart-table

Change-Id: I65d48a6721f57b63ad6f557d7b21d45afb666b85
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Repair deploy-app function on catalog page

Rework the App Manager data type (interface) to have
required 'name' field and use that field when deploying
an application from the FE.
Detect error and show notification with message.
Change catalog table action icon from text to cloud.

Change-Id: I534f12cfe32f1062fa6a2e2cab29c3a9e3e319ef
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Issue-Id: RICPLT-1574

Update pattern to match ANR app by name

Change-Id: I71c3290c2a017d8b82fa49ce0f1af49fc0497e75
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Create overall control with AppControl,RANControl

Remove RAN Connection navigation from left menu
Add navigation to overall control page from home page

Signed-off-by: Sarkar, Anand (as0481) <as0481@att.com>
Issue-Id: RICPLT-1525
Change-Id: Ic59298e1b8a1d40f86c42df43bc6afd81fc17e27

rework admin table

Change-Id: Ie7f475c2fc4254e6b6c7cfcf1f9143b8be9d455c
Signed-off-by: Jun (Nicolas) Hu <jh245g@att.com>
Issue-ID: RICPLT-1375

Upgrade App Manager to version 0.1.5

This adds a method to list the deployable (available) apps.
Extended backend to proxy to the new App Manager method.
Revised the frontend catalog interface, service and screen
to call the new backend method.
Renamed from "xapp-manager" to "app-manager" to be consistent
with that project's naming conventions.

Change-Id: I6216ea09d8e316f00f2df5a73f3a64f89aaf8a54
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add mock user data to backend

Revise frontend to call new backend method

Change-Id: Ic3983c09900d31864352ffd37ea36ae601998190
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Upgrade to E2 API with disconnect-all method

New API spec dated 20190620 adds method nodebDelete()

Change-Id: I1f2d92b56c3cf3c46df09a399046a5846ff64236
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add Xapp Manager config endpoints to backend

Change-Id: I978a18eddcbca0316c7c52c8614370b2bbe97e25
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add feature resilient to missing instance data

Change-Id: If2393623616ad44bf3f9438f9a7c02d45e717340
Signed-off-by: Jun (Nicolas) Hu <jh245g@att.com>
Issue-ID: RICPLT-1513

Pass thru error details from remote APIs

Tweak RAN connection dialog behavior

Change-Id: I597aa55e9a769e83d0a538a822e339cf8816bf62
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Left menu overlap main content fix

Change RAN Connection setup dialog text

Signed-off-by: Sarkar, Anand (as0481) <as0481@att.com>
Issue-Id: RICPLT-1338
Change-Id: I36a6f068d604aff9515fb4c300ad6d1633852dee
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Revise and publish configuration property keys

Add deployment configuration in README

Change-Id: I880b76636ddbf04b09571d5af1fac2028da64826
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Adjust CSS and HTML for main container

Use a calculated height for the main container body
so the tables and other content appear at the top,
not floating down to be vertically centered.

Signed-off-by: Sarkar, Anand (as0481) <as0481@att.com>
Issue-Id: RICPLT-1339
Change-Id: Ib4fb95eccfd7114eb602dd212a7b8f1136bfc45c
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Merge "Upgrade E2 to API spec 20190611"

Add draft INFO.yaml file for LF mgt

Change-Id: I17926a807448e799fa7585e147ccdd627bd77d9e
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Upgrade E2 to API spec 20190611

This adds new endpoint getNb() but does not yet add a
way to discover all connections and/or statuses.

Change-Id: I355d1834394ea1533a8e8ccf14818e5426c37d50
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Merge "Upgrade ANR client to API spec version 0.0.8"

Merge "Add AC xApp control screen"

Upgrade ANR client to API spec version 0.0.8

Make mock data match examples given with the new spec

Change-Id: I80bb9658af2ccf4ca356237b24369be90f8a7608
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add column sorting on ANR page

Issue-ID: RICPLT-1344
Signed-off-by: Jun (Nicolas) Hu <jh245g@att.com>
Change-Id: I33ecdb823367d66b9e648464733ba60794bab2c2

Add AC xApp control screen

Change-Id: I55f0cda8e9207936390aa59b0852a816cce2f2dd
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

add column sorting

Issue-ID: RICPLT-1344
Signed-off-by: Jun (Nicolas) Hu <jh245g@att.com>
Change-Id: Ia7be93ec29aff5ebdb7eaf992bab0ca0a8b860cc

Big red button addition

Signed-off-by: Sarkar, Anand (as0481) <as0481@att.com>
Issue-Id: RICPLT-961
Change-Id: I22ca50d4f4f824879161b6a1e7a64af6eedb02af
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add table with automatic neighbor relation data

Includes edit and delete features.
Drops the xapp screen which was for pendulum control.

Bump version to 1.0.4

Change-Id: I64c5379164dd3a52f33c782d206f11d2b792b18e
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

RAN Connectionscreen upgrade to mat-table

Issue-Id: RICPLT-1343
Signed-off-by: Sarkar, Anand (as0481) <as0481@att.com>
Change-Id: Id0e58a6245e4f99b8dbd534db1993a56072b17c6

Merge "Upgrade ANR API to version 0.0.7"

Upgrade xapp manager API to version 0.1.4

Change-Id: I623be158ba0de031965ea2520c13ac34c1725d0b
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Upgrade ANR API to version 0.0.7

Change-Id: I5c21964e98c5a8202dd40ed10ceca6b39f72dcf2
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Add missing @Bean method to create ggNodebsApi

Change-Id: I777d6242ae3f47005fbd821215317865749e41c9
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

Merge "Apply mat-table to control and catalog"