The Germans never envisioned Locarno (1925) as a solution to Versailles or as a suitable restoration of her rights among nations. At best it was viewed as a means to an end, the first step towards normalization with the west, with the eventual settlement to be reached in Eastern Europe (it intentionally left out any border guarantees in the east with Poland or the Czechs).
To illustrate the view of the military prior to the rise of National Socialism, which was a viewed shared by a large percentage of the political parties (no party looked towards Poland’s frontier as permanent), all one has to do is look at the rearmament plans the Army began, first September 1928 through 1932, which was designed to modernize the defensive capabilities of the German Army. This was followed by Schleicher’s more ambitious plan of November 1932 to expand the Army (actual spending of which occurred under Hitler, – his initial rearmament funds, and plans, came from his predecessor).
With the expectation that war was an eventuality in the east, if not from German aggression seeking restoration, then from aggression from Poland seeking status quo (a real possibility as 1933 proved), the German Army put much of its effort into being prepared on its eastern frontier. One such example was the German Army asking Mauser Oberndorf to investigate the possibilities of converting Nagant 91 and Steyr M95 rifles to the German 7.92 mm cartridge. It was envisioned that in a future conflict it was likely many would be captured and these rifles could be put to use in support and police functions in the German Army.